The Android Automerger
|
ed19c0053f
|
am ddb50fff: am d4b63931: am df35f7dd: am 02dc06a8: am 21484175: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit 'ddb50ffff8227750a160dd26de4ae63a56f4ed1a':
|
2013-04-10 19:41:21 -07:00 |
Jean Chalard
|
4d21e347df
|
am edf26bee: am d1491741: am 1e1d61d2: am d2a0c614: am b4e2a3bb: am 868805ae: Merge "Change which backdoor the tests goes through"
* commit 'edf26bee83603fdd6035f438c16096e4f00f820d':
|
2013-04-10 19:41:19 -07:00 |
|
Jean Chalard
|
f6de7890ca
|
am 3090e8c8: am b154f10c: am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test."
* commit '3090e8c861687d123ac8c5a4073b03f671597ec0':
|
2013-04-10 19:41:18 -07:00 |
Satoshi Kataoka
|
23408ee603
|
am e8f7d669: am 9414d75d: am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP"
* commit 'e8f7d669c53a5d8d5aa215b2a9e793ef2b5d88e6':
|
2013-04-10 19:41:16 -07:00 |
|
Jean Chalard
|
9d071843a4
|
am de19e161: am be9af787: am e405ec76: (-s ours) am 1bd8f332: am 6531bcdc: am ecb59eff: (-s ours) Revert "[DO NOT MERGE] Activate hardware keyboard handling"
* commit 'de19e1615400e8d55d84da185c38e91f22f27be0':
|
2013-04-10 19:41:15 -07:00 |
|
Jean Chalard
|
5a6b0787be
|
am cb7983e4: am ab6ef3b1: am e1f90dce: (-s ours) am 6b29ef46: am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling
* commit 'cb7983e4e29dab246998a2d2d382dafaefa40570':
|
2013-04-10 19:41:14 -07:00 |
Kurt Partridge
|
4c74aaa09a
|
am 5d337ad6: am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
* commit '5d337ad68adf380df593e3f38c39f9b7851b0660':
|
2013-04-10 19:41:13 -07:00 |
Baligh Uddin
|
4a41a48fdb
|
am 27fede0b: am 5db8119d: am 7022bd23: (-s ours) am 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '27fede0b06d05dbc94585087c7f97453ac98593e':
|
2013-04-10 19:41:11 -07:00 |
|
Baligh Uddin
|
166b3f98d8
|
am f4be7558: am c60d81f5: am a35cea39: (-s ours) am 536e7220: am 9bf7e74d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit 'f4be7558190bc638335f59e46fb2d9558eb75e8a':
|
2013-04-10 19:41:10 -07:00 |
|
Kurt Partridge
|
1dc4a24f96
|
am 538974d0: am 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call"
* commit '538974d0ea4afea621490a71d509468e13d88485':
|
2013-04-10 19:41:09 -07:00 |
|
Jean Chalard
|
b8a3454d1a
|
am a7da57de: am 3b8d54bf: am 08a5e43d: am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
* commit 'a7da57decc9db90a812b6f72ebb4c7050d6f8e66':
|
2013-04-10 19:41:07 -07:00 |
Tadashi G. Takaoka
|
ab99e6139b
|
am 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
* commit '8a984e8c4dc6006f1d802cd395143054e3b384b1':
|
2013-04-10 19:41:06 -07:00 |
|
Satoshi Kataoka
|
7d0d728ceb
|
am bc36fbfc: am cb4ae59c: am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP"
* commit 'bc36fbfc6ced487824ef364ec2af457a0c8ce543':
|
2013-04-10 19:41:05 -07:00 |
|
Jean Chalard
|
714b0044f1
|
am 2cd99981: am ed66b232: am cffac321: am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not"
* commit '2cd99981bd2d20f252cf2bdf70d7b71bedc3669a':
|
2013-04-10 19:41:04 -07:00 |
|
Jean Chalard
|
d901066bf6
|
am f921a587: am 76dda675: am c821c723: am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."
* commit 'f921a587842a5b1df59030e38e115e1b830b3164':
|
2013-04-10 19:41:03 -07:00 |
|
Satoshi Kataoka
|
8c485086f5
|
am 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP
* commit '5180572736145cc521fe375a5451bc2bd172dc1a':
|
2013-04-10 19:41:01 -07:00 |
The Android Open Source Project
|
aeb9680522
|
am cfe49191: am 38a9f856: am 228fcdae: (-s ours) am 70616b63: am 08f5b780: am c1dec87a: (-s ours) am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'cfe49191f7ee1d2b3fe17dd37898c625d563982c':
|
2013-04-10 19:41:00 -07:00 |
|
Satoshi Kataoka
|
51c0380fb6
|
am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor"
* commit 'd7c3c523d920dc97a2c4fc3c9430a373f494fe21':
|
2013-04-10 19:40:59 -07:00 |
|
Jean Chalard
|
62e0ee324b
|
am c7163a4c: am 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE
* commit 'c7163a4c8c373520fb8fa82011a366a1d98decea':
|
2013-04-10 19:40:57 -07:00 |
|
Tadashi G. Takaoka
|
05ed9c7631
|
am 617362fd: am 1b7451af: am 57a7a5c3: am 76c00dec: am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler
* commit '617362fdb9d8480a4be301b2e6e1f6b355e0e1a3':
|
2013-04-10 19:40:56 -07:00 |
|
Jean Chalard
|
724e100eea
|
am 84b246f1: am db993a5f: am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE"
* commit '84b246f147295ed4a2c1c95802b130842596e5a2':
|
2013-04-10 19:40:55 -07:00 |
|
Jean Chalard
|
1037300602
|
am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
* commit '5c874a7b58a8f7912315a935e8c5fe4d3fe0d973':
|
2013-04-10 19:40:53 -07:00 |
|
Baligh Uddin
|
36583063a4
|
am 8ed884e7: am ca8ea431: am a3ed3254: am 05b7988a: am 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki
* commit '8ed884e70f1bb5ba9cbfdae009be1cc72dccda39':
|
2013-04-10 19:40:52 -07:00 |
|
Baligh Uddin
|
b3fbdd58be
|
am f939332c: am 94065faf: am c6660830: (-s ours) am 68a0afc3: am 0c777365: am fbb6500d: (-s ours) am 5bcbc21a: (-s ours) am c08b8245: (-s ours) Import translations. DO NOT MERGE
* commit 'f939332ca9eb9ed3139b316598b213f5a55f7864':
|
2013-04-10 19:40:51 -07:00 |
|
The Android Automerger
|
6e6f705ecd
|
am c82a56b4: am ccc3c232: am 228e26f7: am ea46fdcb: am 65dfe94d: am 1237c872: am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit 'c82a56b427baa7edf0ce687af0f7591cbef77185':
|
2013-04-10 19:40:49 -07:00 |
|
Tadashi G. Takaoka
|
ae3ead4962
|
am faadc0a7: am b5843222: am 62b07bf9: am 561a04f3: am 1911c513: am abd22393: am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h
* commit 'faadc0a7cf059ec88f2c54b00a0812e978e6771b':
|
2013-04-10 19:40:48 -07:00 |
|
Tadashi G. Takaoka
|
31f350bcb3
|
am fc369029: am 9c59fb54: am fc0fc521: am e01d1960: am c17e0bba: am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"
* commit 'fc369029abf1ad80a852e9638a08de68ea646412':
|
2013-04-10 19:40:47 -07:00 |
|
Satoshi Kataoka
|
4b24e49b11
|
am a1cd7970: am 71f1b270: am 8138c8d2: am f4f4d6c9: am b3438173: am d3c823c1: am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"
* commit 'a1cd79708f0b093de0f2c297e20e749bdcbad36c':
|
2013-04-10 19:40:46 -07:00 |
|
Tadashi G. Takaoka
|
6ed9580fa3
|
am 098ecd55: am 5283b90a: am 60083e3e: am 49d59d4a: am a469cdfe: am d0495a35: am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils
* commit '098ecd550d3a888df2120264655eb2aa42e92d86':
|
2013-04-10 19:40:44 -07:00 |
|
Baligh Uddin
|
8632fea531
|
am 88db1331: am 6626fb25: am 51c7dbea: (-s ours) am 4379dbea: am 324b1880: am f0213d1a: (-s ours) am c1cb4766: (-s ours) am 6537280f: am 5f976d1c: (-s ours) am ff41125b: (-s ours) am fba54597: Import translations. DO NOT MERGE
* commit '88db1331582d0337aa5f1e12f3c8d5837aabbda7':
|
2013-04-10 19:40:43 -07:00 |
|
Baligh Uddin
|
52d6480af1
|
am f81c9132: am 1e8d1f41: am d72347f9: (-s ours) am 67f7bb2e: am 284d4285: am f0346d70: (-s ours) am fc135df5: (-s ours) am 24daa2a1: am 6616188e: (-s ours) Import translations. DO NOT MERGE
* commit 'f81c91326a3f762d60c7be015270abfee590d68f':
|
2013-04-10 19:40:42 -07:00 |
|
Baligh Uddin
|
643f8f080e
|
am a3328255: am 38f2bbb3: am 210d473d: (-s ours) am a62edb47: am 3d082f1b: am 14ef11a8: (-s ours) am 93c5c7a4: (-s ours) am 2898aac8: Import translations. DO NOT MERGE
* commit 'a3328255291f019389bd685d0150b1a93d74b38c':
|
2013-04-10 19:40:40 -07:00 |
|
Tadashi G. Takaoka
|
6ed94c43a7
|
am 70252ecf: am 5eb7a00e: am 1047bf17: am 32d89afa: am e2ccd61b: am 2b04e787: am 71fb8af7: am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException
* commit '70252ecff784303fbdda2cb9d813719d886279fd':
|
2013-04-10 19:40:39 -07:00 |
|
Baligh Uddin
|
0849b21034
|
am 1cf0e85d: am 97687031: am 0ad31c8d: (-s ours) am a5bc58ac: am 5301db94: am e67698be: (-s ours) am 8051fd0d: (-s ours) am 2a01fc22: am 1e5add78: (-s ours) am 7668deec: (-s ours) am 21160c4e: Import translations. DO NOT MERGE
* commit '1cf0e85d25a3554e8ddd5c563e37e2caed794151':
|
2013-04-10 19:40:38 -07:00 |
|
Baligh Uddin
|
3d8f50ea42
|
am 755db5bd: am 3a97d388: am 273a21ca: (-s ours) am 772dfa51: am ae8b69fd: am 7ea45c07: (-s ours) am 7f859d68: (-s ours) am 8636ba03: am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '755db5bd3edd5758f906fde06f5fd4645fcce9cf':
|
2013-04-10 19:40:36 -07:00 |
|
Baligh Uddin
|
03fbe97cdb
|
am c46a975c: am 9f291d17: am 2f8e381b: (-s ours) am 92adcda6: am 42c255c2: (-s ours) am 599290d5: (-s ours) am b4039d96: (-s ours) am 5709e859: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit 'c46a975ce1a7618c8bdd27f025dd79b8cac29e60':
|
2013-04-10 19:40:35 -07:00 |
Alan Viverette
|
eff2ee76d8
|
am 45b1a302: am 80a2e251: am 14f65cff: am 8e5fa88a: am f518e71a: am c5ec7545: am 8f807582: am e47ee181: am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode.
* commit '45b1a302cff21869db19c26b4b82919b279beeef':
|
2013-04-10 19:40:33 -07:00 |
|
Satoshi Kataoka
|
81295fd2b2
|
am 119e6979: am 745725e1: am 103b1118: am 33c91be3: am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname"
* commit '119e6979846f7cd41f98f1feea7a5959e8c91314':
|
2013-04-10 19:40:32 -07:00 |
|
Tadashi G. Takaoka
|
30d9817bd0
|
am 7dcc22b6: am 5f81bb8c: am 3ef47fd3: am e0aa9383: am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import
* commit '7dcc22b66bc1b1e5d90d6d61ac20f0df4909fb9f':
|
2013-04-10 19:40:31 -07:00 |
|
Tadashi G. Takaoka
|
104923e471
|
am 863d83ea: am 02a59e55: am 1f722ca9: am 4e627c21: am 56796cd7: am 4841df87: am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name"
* commit '863d83ea27af1957a10fca4b42051a9fce399f10':
|
2013-04-10 19:40:29 -07:00 |
|
Satoshi Kataoka
|
1af04dc698
|
am 249ad4d5: am 79376326: am f555b255: am 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"
* commit '249ad4d57ca477eb7a1ba28d6b0e5a505afa9a97':
|
2013-04-10 19:40:28 -07:00 |
|
Baligh Uddin
|
97046d1984
|
am 1d024eca: am 307d2aa2: am 8e48a618: am 18e45a93: am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
* commit '1d024eca3f1d055da2977ad0725da203b8035c2e':
|
2013-04-10 19:40:26 -07:00 |
|
Satoshi Kataoka
|
24cf39e787
|
am 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
* commit '894a8ffcfd76456da3390cd4d3348f0371801669':
|
2013-04-10 19:40:25 -07:00 |
|
Tadashi G. Takaoka
|
59b23bcfae
|
am 680d689d: am c61393c8: am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder
* commit '680d689d859041a666a43a877da79161847f4535':
|
2013-04-10 19:40:24 -07:00 |
|
The Android Open Source Project
|
2099533306
|
am 5d674b16: am 55172624: am b2c2ce31: (-s ours) am 7de82b0e: am 6ab186a1: am c4176236: (-s ours) am 210226c5: (-s ours) am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '5d674b166d151813718e6bf591573947eb3cae9a':
|
2013-04-10 19:40:23 -07:00 |
|
Alan Viverette
|
7c9b7f249e
|
am e592be58: am 046a311a: am d19c71d9: am 3c082157: am 44678fcf: am f1bcc1d7: am 9ecac40d: am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
* commit 'e592be58095180558f18a36f7f42527a0af0e38a':
|
2013-04-10 19:40:21 -07:00 |
|
Jean Chalard
|
288deb7ab9
|
am 11034c34: am dee08de2: am 724ff298: (-s ours) am 4ddfde7b: am a050834c: am 11b600b9: (-s ours) am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev
* commit '11034c340a0b5fc294b69bb1c37e159255dd6ba5':
|
2013-04-10 19:40:20 -07:00 |
|
Jean Chalard
|
db3713a1b9
|
am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit '9f9050d18fc3708badc6f906744d500458c70d36':
|
2013-04-10 19:40:18 -07:00 |
|
Baligh Uddin
|
492016265c
|
am 0b758ec7: am e7edb561: am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE
* commit '0b758ec77fc14f768ddea0693e5d412086a591ef':
|
2013-04-10 19:40:17 -07:00 |
|
Baligh Uddin
|
14d778b27c
|
am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
* commit '3847aa30ae68a7e94daa484643ea68f16860d062':
|
2013-04-10 19:40:16 -07:00 |