aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 967cb0f0: Merge "Remove some logs which spam encrypted boot"Jean Chalard2014-09-191-10/+8
|\ | | | | | | | | * commit '967cb0f0dfc5ff5a09414cac21533416bc95f091': Remove some logs which spam encrypted boot
| * Merge "Remove some logs which spam encrypted boot"Jean Chalard2014-09-191-10/+8
| |\
| | * Remove some logs which spam encrypted bootJean Chalard2014-09-191-10/+8
| | | | | | | | | | | | | | | Bug: 17539539 Change-Id: Idb442c2f0db2361b8e535f39b02d209b1edd1069
* | | am f1fb3fa2: (-s ours) am f5d0d89f: (-s ours) am c285fd7b: (-s ours) am ↵Baligh Uddin2014-09-190-0/+0
|\| | | | | | | | | | | | | | | | | a033e8fd: (-s ours) am 9f78f924: (-s ours) am 64dd48e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'f1fb3fa2ffcd403b0f6b3ed4f4ffa4ec82c14f82':
| * | am f5d0d89f: (-s ours) am c285fd7b: (-s ours) am a033e8fd: (-s ours) am ↵Baligh Uddin2014-09-190-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | 9f78f924: (-s ours) am 64dd48e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'f5d0d89f186d8a0411e38c227ea369f25f428bc9':
| | * \ am c285fd7b: (-s ours) am a033e8fd: (-s ours) am 9f78f924: (-s ours) am ↵Baligh Uddin2014-09-160-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 64dd48e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'c285fd7bbb3c27d7dc7c38acb61507dc268bbe97':
| | | * \ am a033e8fd: (-s ours) am 9f78f924: (-s ours) am 64dd48e3: (-s ours) Merge ↵Baligh Uddin2014-09-120-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-dev * commit 'a033e8fdc6a77ed8f37831bcbddc28ffcc7b7354': Import translations. DO NOT MERGE
| | | | * | am 9f78f924: (-s ours) am 64dd48e3: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-09-120-0/+0
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-dev * commit '9f78f92435c3c6ccb71dcf9d7bdcb38ad2660a99': Import translations. DO NOT MERGE
| | | | * | am 64dd48e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-09-110-0/+0
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '64dd48e381266ac63a2b9d6145040191bacdae10': Import translations. DO NOT MERGE
* | | | | | am 02e25240: am 72b774e2: am ca8935c0: am dc1097ee: Merge "Update AOSP ↵Tadashi G. Takaoka2014-09-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | launcher icon" into lmp-dev * commit '02e25240b59d7934e669d8b549378ad38fc56200':
| * | | | | am 72b774e2: am ca8935c0: am dc1097ee: Merge "Update AOSP launcher icon" ↵Tadashi G. Takaoka2014-09-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '72b774e2d38403cf4c29a7bcb25005c415e29a38':
| | * | | | am ca8935c0: am dc1097ee: Merge "Update AOSP launcher icon" into lmp-devTadashi G. Takaoka2014-09-160-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | * commit 'ca8935c0e1fb75ed5656dcce9a945b0491ed5b26':
| | | * | | am dc1097ee: Merge "Update AOSP launcher icon" into lmp-devTadashi G. Takaoka2014-09-115-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dc1097ee2e85daaed525ceff2154d4d7252c75ed': Update AOSP launcher icon
* | | | | | | am c8de4e96: am db8ea804: am f2ddbcc1: am 31544dcb: Add xxxhdpi assetsTadashi G. Takaoka2014-09-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c8de4e965e7f277edc5adfbe368bd88d30f84ef0':
| * | | | | | am db8ea804: am f2ddbcc1: am 31544dcb: Add xxxhdpi assetsTadashi G. Takaoka2014-09-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db8ea8044a45f10f231f8b255d8a72ae1d64cb50':
| | * | | | | am f2ddbcc1: am 31544dcb: Add xxxhdpi assetsTadashi G. Takaoka2014-09-160-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2ddbcc1f90f729151d8ef0e3e19b5b9cdc5c81e':
| | | * | | | am 31544dcb: Add xxxhdpi assetsTadashi G. Takaoka2014-09-1197-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '31544dcb43bfb4f14339d1c2b3ffa92063487c0c': Add xxxhdpi assets
* | | | | | | | am fa00bee9: am 083e66cf: am ebe6b600: am cd119050: Support CursorAnchorInfo ↵Yohei Yukawa2014-09-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the full-screen mode * commit 'fa00bee9d8412af6c53d38b2a224711704d09214':
| * | | | | | | am 083e66cf: am ebe6b600: am cd119050: Support CursorAnchorInfo in the ↵Yohei Yukawa2014-09-190-0/+0
| |\| | | | | | | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | full-screen mode * commit '083e66cfa021b16e73e6dd2897971ca94c0eb3fc':
| | * | | | | am ebe6b600: am cd119050: Support CursorAnchorInfo in the full-screen modeYohei Yukawa2014-09-160-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ebe6b6009fb0d58baef9d5d3ac75e1a67151bf23':
| | | * | | | am cd119050: Support CursorAnchorInfo in the full-screen modeYohei Yukawa2014-09-113-20/+291
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cd11905022306c9b95f8781f0f8b23a3570f30e9': Support CursorAnchorInfo in the full-screen mode
* | | | | | | | am 63e48365: Merge "Make MAX_PREV_WORD_COUNT_FOR_N_GRAM 2."Keisuke Kuroyanagi2014-09-191-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '63e483658fb993338db1259d44de8de848aae14b': Make MAX_PREV_WORD_COUNT_FOR_N_GRAM 2.
| * | | | | | | Merge "Make MAX_PREV_WORD_COUNT_FOR_N_GRAM 2."Keisuke Kuroyanagi2014-09-191-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Make MAX_PREV_WORD_COUNT_FOR_N_GRAM 2.Keisuke Kuroyanagi2014-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14425059 Change-Id: Iefacd7e4a6c256658a58856240310eeb91ae32db
* | | | | | | | | am ca93dda3: am 106706ce: Merge branch \'lmp-mr1-dev-plus-aosp\' of ↵Budi Kusmiantoro2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://googleplex-android.googlesource.com/_direct/platform/packages/inputmethods/LatinIME into lmp-mr1-dev-plus-aosp * commit 'ca93dda3fdb293a7a04782c2e02c4107900dc10b':
| * | | | | | | | am 106706ce: Merge branch \'lmp-mr1-dev-plus-aosp\' of ↵Budi Kusmiantoro2014-09-180-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://googleplex-android.googlesource.com/_direct/platform/packages/inputmethods/LatinIME into lmp-mr1-dev-plus-aosp * commit '106706ced9bde3b31fffcb2acaa642e7bf00208a':
| | * | | | | | | Merge branch 'lmp-mr1-dev-plus-aosp' of ↵Budi Kusmiantoro2014-09-1551-148/+242
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://googleplex-android.googlesource.com/_direct/platform/packages/inputmethods/LatinIME into lmp-mr1-dev-plus-aosp
* | | | | | | | | | am 3e88484e: am f5901b6e: am 1b459415: am 486c4894: Keep aspect ratio of ↵Tadashi G. Takaoka2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Material action key background * commit '3e88484e460f5e341883ec8dd8b43d804f7f9774':
| * | | | | | | | | am f5901b6e: am 1b459415: am 486c4894: Keep aspect ratio of Material action ↵Tadashi G. Takaoka2014-09-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key background * commit 'f5901b6e2ddbfbf4b9949688858f8461c3d7a1e5':
| | * | | | | | | | am 1b459415: am 486c4894: Keep aspect ratio of Material action key backgroundTadashi G. Takaoka2014-09-120-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | * commit '1b459415883fa7ba8cf9b7237d4b78f030086f05':
| | | * | | | | | | am 486c4894: Keep aspect ratio of Material action key backgroundTadashi G. Takaoka2014-09-099-26/+90
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '486c4894ce0917fc7b18eaee4bfd031051f2b05b': Keep aspect ratio of Material action key background
* | | | | | | | | | | am 85f37c03: am c63e06ed: am 5e3b3ab8: am 9395014e: Don\'t resume ↵Jean Chalard2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | suggestions with H/W keyboard * commit '85f37c0307edfb0a875348d4e5c2f4ee892d8302':
| * | | | | | | | | | am c63e06ed: am 5e3b3ab8: am 9395014e: Don\'t resume suggestions with H/W ↵Jean Chalard2014-09-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyboard * commit 'c63e06ede857c1987ae3514cda825eaee6788516':
| | * | | | | | | | | am 5e3b3ab8: am 9395014e: Don\'t resume suggestions with H/W keyboardJean Chalard2014-09-120-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e3b3ab80994963b79fb0ca6f402ca3bc1a2260d':
| | | * | | | | | | | am 9395014e: Don\'t resume suggestions with H/W keyboardJean Chalard2014-09-081-41/+72
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9395014e76877fc9ef060a3fe54a9e06f0036d6d': Don't resume suggestions with H/W keyboard
* | | | | | | | | | | | am 14d83af5: am 1314e81b: am 1708ff6e: am 914078fd: Fix a bug where ↵Jean Chalard2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recorrection would stop on connectors * commit '14d83af5529e32ef5b65df350c83d780a6f8e08c':
| * | | | | | | | | | | am 1314e81b: am 1708ff6e: am 914078fd: Fix a bug where recorrection would ↵Jean Chalard2014-09-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stop on connectors * commit '1314e81b22a0bdc15f79d8a7f2ae66b9916227ae':
| | * | | | | | | | | | am 1708ff6e: am 914078fd: Fix a bug where recorrection would stop on connectorsJean Chalard2014-09-120-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1708ff6e5416d4333d3f52f62cd71b64ea580cd7':
| | | * | | | | | | | | am 914078fd: Fix a bug where recorrection would stop on connectorsJean Chalard2014-09-084-26/+54
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '914078fd9198aeb3d7ffa034562321d688d588f7': Fix a bug where recorrection would stop on connectors
* | | | | | | | | | | | | am 4f5da734: am 41d65a60: am b28b83cc: am 42665f0e: Merge "Mark ↵Tadashi G. Takaoka2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isDefault="true" for all supported subtypes" into lmp-dev * commit '4f5da734fbe1262ee9ebd8821f73070ef40d3c16':
| * | | | | | | | | | | | am 41d65a60: am b28b83cc: am 42665f0e: Merge "Mark isDefault="true" for all ↵Tadashi G. Takaoka2014-09-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | supported subtypes" into lmp-dev * commit '41d65a60d59df75c42ab0fe93e575b8987bbbe2b':
| | * | | | | | | | | | | am b28b83cc: am 42665f0e: Merge "Mark isDefault="true" for all supported ↵Tadashi G. Takaoka2014-09-120-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subtypes" into lmp-dev * commit 'b28b83cc4c7b7dce85b0f51f7d4f3b1122db729d':
| | | * | | | | | | | | | am 42665f0e: Merge "Mark isDefault="true" for all supported subtypes" into ↵Tadashi G. Takaoka2014-09-0818-0/+432
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '42665f0ee26407fae984446b306309376aac2b36': Mark isDefault="true" for all supported subtypes
* | | | | | | | | | | | | | am f99e2a0f: am 8d2551c6: am b0c7f313: am 1caa0b71: Merge "Follow up API ↵Yohei Yukawa2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | signature changes of CursorAnchorInfo" into lmp-dev * commit 'f99e2a0fe2f26e353cf3ff462ccba0e51e4bbc2c':
| * | | | | | | | | | | | | am 8d2551c6: am b0c7f313: am 1caa0b71: Merge "Follow up API signature ↵Yohei Yukawa2014-09-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes of CursorAnchorInfo" into lmp-dev * commit '8d2551c68f9b567e719bc9912f5bb4ffcf6db400':
| | * | | | | | | | | | | | am b0c7f313: am 1caa0b71: Merge "Follow up API signature changes of ↵Yohei Yukawa2014-09-120-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CursorAnchorInfo" into lmp-dev * commit 'b0c7f31333313c6d7d492c32b31b883640f3c1e0':
| | | * | | | | | | | | | | am 1caa0b71: Merge "Follow up API signature changes of CursorAnchorInfo" ↵Yohei Yukawa2014-09-082-13/+18
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '1caa0b714dc49c8723d36d4d9825427f8978a602': Follow up API signature changes of CursorAnchorInfo
* | | | | | | | | | | | | | | am 7389b763: am fc387d7e: am 7737c9d7: am cb077f75: Merge "Resolve an old ↵Jean Chalard2014-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO." into lmp-dev * commit '7389b76354e96059ced7ed43244763853772c926':
| * | | | | | | | | | | | | | am fc387d7e: am 7737c9d7: am cb077f75: Merge "Resolve an old TODO." into lmp-devJean Chalard2014-09-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc387d7ef993bbcaf236a1ed65717432cfd8b0ec':
| | * | | | | | | | | | | | | am 7737c9d7: am cb077f75: Merge "Resolve an old TODO." into lmp-devJean Chalard2014-09-120-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7737c9d712b37a3616267ac28848f8f3d74b29d6':