diff options
author | Michael Wright <michaelwr@google.com> | 2014-08-22 20:28:13 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-22 20:28:13 +0000 |
commit | 4dbac6123e0de12e58ed6115807b3015b1c5c77d (patch) | |
tree | 111ad5ac5bf0b849209b063c9d49d8f1fe187187 | |
parent | 61bb4af1145161b2bcfa91f215721ddca38c37e8 (diff) | |
parent | 94ac8f0228f7296e940010d9bd17414fe6b7ab0c (diff) | |
download | manta-4dbac6123e0de12e58ed6115807b3015b1c5c77d.tar.gz |
Merge "Remove stale keylayout annotations" into lmp-dev
-rw-r--r-- | manta-keypad.kl | 6 | ||||
-rw-r--r-- | smdk5250-keypad.kl | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/manta-keypad.kl b/manta-keypad.kl index 4410cae..445214a 100644 --- a/manta-keypad.kl +++ b/manta-keypad.kl @@ -12,6 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -key 114 VOLUME_DOWN WAKE -key 115 VOLUME_UP WAKE -key 116 POWER WAKE +key 114 VOLUME_DOWN +key 115 VOLUME_UP +key 116 POWER diff --git a/smdk5250-keypad.kl b/smdk5250-keypad.kl index 2d0ea8a..9aa1ca5 100644 --- a/smdk5250-keypad.kl +++ b/smdk5250-keypad.kl @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -key 116 POWER WAKE +key 116 POWER |