OSDN Git Service

Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96
authorChenjie Luo <cjluo@google.com>
Thu, 14 Jan 2016 02:29:13 +0000 (02:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Jan 2016 02:29:13 +0000 (02:29 +0000)
am: d5cea64d8d

* commit 'd5cea64d8d63e9ffb61af1e669962de08ea513cc':
  Add STEM_1, STEM_2 and STEM_3 key as wakeup keys


Trivial merge