aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Avoid NPE when logging the entry point to Settings"Jatin Matani2015-03-241-1/+1
|\
| * Avoid NPE when logging the entry point to SettingsJatin Matani2015-03-241-1/+1
| | | | | | | | | | | | | | | | The populator class that serializes the proto uses a switch and throws an NPE. Bug:19911288 Change-Id: Id0fa371b3c64e706e14a13bb6e643406f94be035
* | Merge "Change DictionaryStats to report content version."Dan Zivkovic2015-03-244-41/+53
|\ \
| * | Change DictionaryStats to report content version.Dan Zivkovic2015-03-244-41/+53
| | | | | | | | | | | | | | | | | | Bug 19908719. Change-Id: I5a00b5277e9cd7d964b53ff5823bada21be110fa
* | | Merge "DO NOT MERGE. Do not access metadatadb from main thread."Ulas Kirazci2015-03-241-20/+44
|\ \ \ | |/ / |/| |
| * | DO NOT MERGE. Do not access metadatadb from main thread.Ulas Kirazci2015-03-201-20/+44
| | | | | | | | | | | | | | | | | | | | | Also fix Refresh button replicating itself on orientation change. Bug: 19786650 Change-Id: I19a964d69d9141ba6515bbe19a120d4685628fe3
* | | am 823aaf0f: (-s ours) am c787bd66: am 6f09e99d: am 2bc9f407: Block overflow ↵Dan Zivkovic2015-03-240-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | menu during setup. DO NOT MERGE * commit '823aaf0f7d90823671fc4aabce6e56145f29921a': Block overflow menu during setup. DO NOT MERGE
| * \ \ am c787bd66: am 6f09e99d: am 2bc9f407: Block overflow menu during setup. DO ↵Dan Zivkovic2015-03-231-2/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE * commit 'c787bd666330f872e2f3aff0d3f590724f95d574': Block overflow menu during setup. DO NOT MERGE
| | * \ \ am 6f09e99d: am 2bc9f407: Block overflow menu during setup. DO NOT MERGEDan Zivkovic2015-03-231-2/+14
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '6f09e99d24b4f67ef14d78a18a246da67cca650e': Block overflow menu during setup. DO NOT MERGE
| | | * \ \ am 2bc9f407: Block overflow menu during setup. DO NOT MERGEDan Zivkovic2015-03-231-2/+14
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2bc9f4073d872ac3ffb56e44bef39e24da12a66f': Block overflow menu during setup. DO NOT MERGE
| | | | * | | Block overflow menu during setup. DO NOT MERGEDan Zivkovic2015-03-231-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 19866981. Change-Id: I757dacaa29a132c65841b9aaa2cc070ed9fa712c (cherry picked from commit 75fc9080a83881e5d8961eb21caa93496a84483e)
* | | | | | | Merge "Disable Hinglish locale."Chieu Nguyen2015-03-243-4/+6
|\ \ \ \ \ \ \
| * | | | | | | Disable Hinglish locale.Chieu Nguyen2015-03-233-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19899126. Change-Id: I1824233b3bcb6cb6579714a7eb375ea2cebc39db
* | | | | | | | Remove dependency in correction settings.Chieu Nguyen2015-03-231-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autocorrection and next-word suggestion are independent, but the settings UI creates a dependency. Bug: 19896768. Change-Id: Ibcdd497cdfd7b9c3a69c61e0c2d116d67df84ef8
* | | | | | | | Merge "Reenable next-word suggestion if autocorrection reenabled."Chieu Nguyen2015-03-241-5/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Reenable next-word suggestion if autocorrection reenabled.Chieu Nguyen2015-03-231-5/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19896768. Change-Id: Ifeb3401612416e58bb362c5250ce0c15fc4b3c45
* | | | | | | | Merge "We can't spell check Russian without an LM."Dan Zivkovic2015-03-242-10/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | We can't spell check Russian without an LM.Dan Zivkovic2015-03-232-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I635a51acc2e45aebe23a1cf69da1b5c72a6ac9e1
* | | | | | | | am c9e43b1d: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT ↵Qiwen Zhao2015-03-230-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | | | | | | | | MERGE ANYWHERE. * commit 'c9e43b1dbbefcc5cafea87976e9f6a59163731a0':
| * | | | | | reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-200-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | am c24340f9: am 74d59cca: am dc1097ee: Merge "Update AOSP launcher icon" ↵Tadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'c24340f956c16d8594c44d45685f8a814538245b':
| | * \ \ \ \ \ am 1073ef97: am 1bb20aa0: am 31544dcb: Add xxxhdpi assetsTadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1073ef9756617ecd2b4eeddca045039d9e6f3d14':
| | * \ \ \ \ \ \ am ead70974: am 27ccbeb4: am cd119050: Support CursorAnchorInfo in the ↵Yohei Yukawa2015-03-200-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | full-screen mode * commit 'ead70974aecd78d5bad0fa87a759f6bf82dcb503':
| | * \ \ \ \ \ \ \ am c29276b7: am 12814352: am 486c4894: Keep aspect ratio of Material action ↵Tadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key background * commit 'c29276b782cfc45be5ab79177e991f2cba8fb04b':
| | * \ \ \ \ \ \ \ \ am beb74610: am ab18b5f1: am 9395014e: Don\'t resume suggestions with H/W ↵Jean Chalard2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyboard * commit 'beb746103011149d6dfce10278475946e679263d':
| | * \ \ \ \ \ \ \ \ \ am 61e7afa6: am 0eaa25e0: am 914078fd: Fix a bug where recorrection would ↵Jean Chalard2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stop on connectors * commit '61e7afa6fa98939f9dcb9f7a2ebb5678a51d4201':
| | * \ \ \ \ \ \ \ \ \ \ am 50e8d585: am 56c7ceb4: am 42665f0e: Merge "Mark isDefault="true" for all ↵Tadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | supported subtypes" into lmp-dev * commit '50e8d5854b981b7fbad24fdb9c141ddf39eb904a':
| | * \ \ \ \ \ \ \ \ \ \ \ am 42ddc212: am f930ce12: am 1caa0b71: Merge "Follow up API signature ↵Yohei Yukawa2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes of CursorAnchorInfo" into lmp-dev * commit '42ddc2127deb117a0bb2b7a7797cb8c9ba335f5a':
| | * \ \ \ \ \ \ \ \ \ \ \ \ am c3fac52d: am 1f74ba17: am cb077f75: Merge "Resolve an old TODO." into lmp-devJean Chalard2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c3fac52dd51ba70db83d96b2d421bd440683d9bc':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am c1ee8857: am a6c53d31: am 257dfa79: Merge "Revert "Use right arrow for ↵Yohei Yukawa2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the commit indicator"" into lmp-dev * commit 'c1ee88572232235d5972220ec1e5232de58a916e':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ad4de3fc: am 9ca6658e: am 0f33e614: Implement Floating Action Button more ↵Tadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keys keyboard * commit 'ad4de3fc819d658775eed470fc74ad76da5caad2':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3aabf655: am f21c77d7: am 727e818e: Move more keys divider to ↵Tadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MoreKeysKeyboardView * commit '3aabf655d0125fb824e5e47687f5084b2df6979c':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 079f9c3f: am 1b430219: am 6888ec00: Merge "Create donottranslate debug ↵Tadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings string resources file" into lmp-dev * commit '079f9c3f5ae7b2f7926321522b6020affd422b52':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 82c8696f: am c7b8858e: am 6ba84dcd: Merge "Refactor action label/icon ↵Tadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | definitions" into lmp-dev * commit '82c8696f526d3ab121a7e8d188acf30ce6ae8e9c':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d9458302: am 9d3db691: am 79eae0ad: Merge "Update active key backgrounds" ↵Tadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'd9458302ea69301c521c2d77dc52cb1ae0499d19':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 701fb172: (-s ours) am 3d84b383: (-s ours) am 3305a02d: (-s ours) Import ↵Baligh Uddin2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '701fb1726df615d77ff634da0446743eb164401b':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 06429878: am 464ff7c1: Add unit tests for enter key\'s more keysTadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '06429878808f3e072ee34e97ac7a9085da9f8e79':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b506390b: am e8e08213: Merge "Add shared abstract test class for action ↵Tadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | label test" into lmp-dev * commit 'b506390b3538fb6ef90cc91a9f5622f52c5e245d':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2ff7865e: am cc5050d7: Update spacebar background for MaterialTadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2ff7865e87bf8bc27e6c3f6d6067caec8828ebbf':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c297197b: am 1c2cf719: Add new value "spacebar" to Key.backgroundType ↵Tadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attribute * commit 'c297197b1548307c31017ba3dc89bbb6bbf2223e':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ec7d6752: am 5a9c9649: Removes "customAction" value from ↵Tadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Key.backgroundType attribute * commit 'ec7d67529e0dd4e5bf87e3b96c4b78db44adb96f':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2a7a5740: am 0af2472a: Add new "keyboardTheme" <case> predicatorTadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2a7a5740e929503a0aca23f376175a9c118b7a83':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f2c509a8: am 310da35c: Merge "Follow up API signature change" into lmp-devYohei Yukawa2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2c509a81ef107e6c71dc6804417469d12c94fca':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 836987c0: am ca70bd5f: Fix depedency of debug settingsTadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '836987c0cd3d290425b37209e98295734aedb017':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6e29bf56: am 8c42bf54: Follow API signature change in CursorAnchorInfoYohei Yukawa2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e29bf56c680331a7d1a50be38212c1356cb584d':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 15c29c35: am 6ef88a65: Merge "Use right arrow for the commit indicator" ↵Yohei Yukawa2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '15c29c3538695145d34b883a1ad8222458eb6eaa':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3ad86d91: am afa9d6d8: Merge "Add theme aware key popup preview ↵Tadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | animation" into lmp-dev * commit '3ad86d91f1e3d251635303e0fb9a83dce22efa3a':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3e9bbf17: am f4383ed3: Fix missing Material light more keys\' backgroundTadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3e9bbf17350d385352e62ce2326ad5898619fb88':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 446f53f9: am ee0d8077: Show the commit indicator only for word to be ↵Yohei Yukawa2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | auto-corrected * commit '446f53f9c03a7846bd3d13cf61f1a7851cc8ae74':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 034a4a5a: am c4710124: Merge "Fix the order of keys on more keys ↵Tadashi G. Takaoka2015-03-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyboard" into lmp-dev * commit '034a4a5a19ba37dba8999b3763ae756fe748deaf':