From: tmk <nobody@nowhere>
Date: Mon, 17 Nov 2014 19:10:48 +0000 (+0900)
Subject: Merge branch 'action_fix'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=196164146363d5f3bfb97435f3ac6dfa13c8da72;p=tmk_firmware.git

Merge branch 'action_fix'
---

196164146363d5f3bfb97435f3ac6dfa13c8da72