The Android Automerger
|
c3c7712f20
|
am a6ec455e: am f67e7488: am ed19c005: am ddb50fff: am d4b63931: am df35f7dd: am 02dc06a8: am 21484175: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit 'a6ec455e5002c1d6868f2f0a2ee3a3858794e6c2':
|
2013-04-17 19:45:25 -07:00 |
Jean Chalard
|
d981caa796
|
am e8675585: am 2d6305ca: am 4d21e347: am edf26bee: am d1491741: am 1e1d61d2: am d2a0c614: am b4e2a3bb: am 868805ae: Merge "Change which backdoor the tests goes through"
* commit 'e8675585cdacdce8ffdf169fa876cfa5a82e77a2':
|
2013-04-17 19:45:24 -07:00 |
|
Jean Chalard
|
46c38c6eab
|
am 445d1115: am 7aa9277f: am f6de7890: am 3090e8c8: am b154f10c: am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test."
* commit '445d1115a00134846e51a38124d8679ad5c4e91b':
|
2013-04-17 19:45:22 -07:00 |
Satoshi Kataoka
|
ab3280f0e4
|
am f9d5d101: am 75b099f4: am 23408ee6: am e8f7d669: am 9414d75d: am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP"
* commit 'f9d5d10166d4e152e273196666e789f989112fdc':
|
2013-04-17 19:45:21 -07:00 |
|
Jean Chalard
|
17e964b18c
|
am ce2a5f93: am 44590a16: am 9d071843: (-s ours) 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 'ce2a5f93aed2862f4397871d317d31baeac57f82':
|
2013-04-17 19:45:19 -07:00 |
|
Jean Chalard
|
bd531725f5
|
am 01a862fb: am fd59acce: am 5a6b0787: (-s ours) am cb7983e4: am ab6ef3b1: am e1f90dce: (-s ours) am 6b29ef46: am 558f41d4: am c741f1f8: (-s ours) [DO NOT MERGE] Activate hardware keyboard handling
* commit '01a862fba392db93985d7c644ba4728047b7ec2d':
|
2013-04-17 19:45:18 -07:00 |
Kurt Partridge
|
4376a55e04
|
am 0f8c86c8: am a3837fd1: am 4c74aaa0: am 5d337ad6: am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
* commit '0f8c86c8ea9a81f0f4dd2fcf0c9abc9e1568125f':
|
2013-04-17 19:45:12 -07:00 |
Baligh Uddin
|
761c188aa4
|
am 08f0697b: am 6a7f4639: am 4a41a48f: (-s ours) am 27fede0b: am 5db8119d: am 7022bd23: (-s ours) am 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '08f0697bc37d6ba06e3cc20c0e6e58f24a638f79':
|
2013-04-17 19:45:10 -07:00 |
|
Baligh Uddin
|
6f4025d64c
|
am fbc91459: am 6ff63273: am 166b3f98: (-s ours) 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 'fbc9145961fe3be8732ae7dc04de17b201c1029d':
|
2013-04-17 19:45:09 -07:00 |
|
Kurt Partridge
|
c0486a58ef
|
am 3a63e4e3: am 3fcaa3e8: am 1dc4a24f: am 538974d0: am 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call"
* commit '3a63e4e3b8175faeca1f8135a6bdf6e7642b96cb':
|
2013-04-17 19:45:08 -07:00 |
|
Jean Chalard
|
dbb031c74a
|
am 56e931de: am feb16b6d: am b8a3454d: am a7da57de: am 3b8d54bf: am 08a5e43d: am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
* commit '56e931de8055a0cd181bc16b51a605a3da06ead6':
|
2013-04-17 19:45:06 -07:00 |
Tadashi G. Takaoka
|
59e17512cf
|
am 85fca857: am 300d3bde: am ab99e613: am 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
* commit '85fca857af9987993c82c76fb63aa07935c291cc':
|
2013-04-17 19:45:05 -07:00 |
|
Satoshi Kataoka
|
a08620f13f
|
am eeb38639: am 65690000: am 7d0d728c: am bc36fbfc: am cb4ae59c: am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP"
* commit 'eeb386390ac5282d2212128aa5bec4a5c1a98092':
|
2013-04-17 19:45:04 -07:00 |
|
Jean Chalard
|
484e914477
|
am e29ffdb6: am c14fdded: am 714b0044: 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 'e29ffdb6c6344e7dd13936e22b8858c84b3802c4':
|
2013-04-17 19:45:03 -07:00 |
|
Jean Chalard
|
472f764f57
|
am 267e6179: am c26022cf: am d901066b: am f921a587: am 76dda675: am c821c723: am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."
* commit '267e61790a6d1f41ead37efd6a4045f48227ff8b':
|
2013-04-17 19:45:01 -07:00 |
|
Satoshi Kataoka
|
a59d936c44
|
am 371369d9: am d196cb64: am 8c485086: am 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP
* commit '371369d9f12b2ad47e328b0ec3e9268c64d68dd0':
|
2013-04-17 19:45:00 -07:00 |
The Android Open Source Project
|
892fcbfb89
|
am e2cc803c: am a0b2dc74: am aeb96805: (-s ours) 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 'e2cc803c4674b5efe49a19c82ca1f1fc9a131990':
|
2013-04-17 19:44:58 -07:00 |
|
Satoshi Kataoka
|
e1829730c8
|
am 14175662: am b949db38: am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor"
* commit '1417566219204f75eff13d3cd69ff3513f253971':
|
2013-04-17 19:44:57 -07:00 |
|
Jean Chalard
|
783b0862a1
|
am 34c0bef6: am 9a181179: am 62e0ee32: am c7163a4c: am 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE
* commit '34c0bef6759e22f0f9ac8aeadb9cd03c2b664c7f':
|
2013-04-17 19:44:56 -07:00 |
|
Tadashi G. Takaoka
|
a1b056088f
|
am c01de725: am 023ed8a6: am 05ed9c76: am 617362fd: am 1b7451af: am 57a7a5c3: am 76c00dec: am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler
* commit 'c01de7259d83a48c4879f886c48b620d99f30fbd':
|
2013-04-17 19:44:54 -07:00 |
|
Jean Chalard
|
9477d7b37e
|
am a6ec1871: am 3f17ab41: am 724e100e: am 84b246f1: am db993a5f: am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE"
* commit 'a6ec1871fe1af4982fd13aafe3f59d574a2b172c':
|
2013-04-17 19:44:53 -07:00 |
|
Jean Chalard
|
8f89b9b13d
|
am ccb3dc02: am 0eb58dfe: am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
* commit 'ccb3dc022515a28172ef147d07a96b8ff444fe7e':
|
2013-04-17 19:44:51 -07:00 |
|
Baligh Uddin
|
42f36bb6ea
|
am 2456eb3a: am faa708c3: am 36583063: 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 '2456eb3a25501b2a28d0a872b27952d5c903d887':
|
2013-04-17 19:44:50 -07:00 |
|
Baligh Uddin
|
5e79a34461
|
am f205c258: am dbf9168f: am b3fbdd58: (-s ours) 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 'f205c258636da9cad5a7ac782598b9f7701bca4b':
|
2013-04-17 19:44:49 -07:00 |
|
The Android Automerger
|
abaea38f58
|
am 13ac43b3: am 2cb2c001: am 6e6f705e: 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 '13ac43b3e604e31ee3e3a3e0e57279637b1ccab7':
|
2013-04-17 19:44:48 -07:00 |
|
Tadashi G. Takaoka
|
c7420082be
|
am f6f20ab2: am 19b5a104: am ae3ead49: 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 'f6f20ab26ba9348789dc970b7415f453d8a4acf2':
|
2013-04-17 19:44:46 -07:00 |
|
Tadashi G. Takaoka
|
707d7d036c
|
am 9a2c21ba: am 6e536321: am 31f350bc: am fc369029: am 9c59fb54: am fc0fc521: am e01d1960: am c17e0bba: am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"
* commit '9a2c21bab9e46f2c30ad20e27041f10bba81573d':
|
2013-04-17 19:44:45 -07:00 |
|
Satoshi Kataoka
|
1ca787391e
|
am 6a8da44f: am 5d1d7863: am 4b24e49b: am a1cd7970: am 71f1b270: am 8138c8d2: am f4f4d6c9: am b3438173: am d3c823c1: am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"
* commit '6a8da44f18ca208fd2a183ccafadb2f8b2ea6dd5':
|
2013-04-17 19:44:44 -07:00 |
|
Tadashi G. Takaoka
|
8c8978196a
|
am b97fe385: am 47d68e5d: am 6ed9580f: am 098ecd55: am 5283b90a: am 60083e3e: am 49d59d4a: am a469cdfe: am d0495a35: am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils
* commit 'b97fe385527180197563d243a2fb783849d8e3b3':
|
2013-04-17 19:44:42 -07:00 |
|
Baligh Uddin
|
13f392100c
|
am ce453840: am 32e84531: am 8632fea5: (-s ours) 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 NO
* commit 'ce4538407432c0941ba543eb746c78dc95116d4f':
|
2013-04-17 19:44:41 -07:00 |
|
Baligh Uddin
|
c346b2dcfa
|
am de5560e2: am 0218ddb3: am 52d6480a: (-s ours) 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 'de5560e254b4b99ebd3452187db1f77ac2fc6fdb':
|
2013-04-17 19:44:38 -07:00 |
|
Baligh Uddin
|
b233e047f7
|
am 062a6c02: am dbd8eec7: am 643f8f08: (-s ours) 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 '062a6c0255687cb082c087f1b0e27afe1980035c':
|
2013-04-17 19:44:37 -07:00 |
|
Tadashi G. Takaoka
|
d88350e271
|
am 2721db44: am b779b268: am 6ed94c43: am 70252ecf: am 5eb7a00e: am 1047bf17: am 32d89afa: am e2ccd61b: am 2b04e787: am 71fb8af7: am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException
* commit '2721db44ab5a7c2190426b54ec839d923286c9a4':
|
2013-04-17 19:44:36 -07:00 |
|
Baligh Uddin
|
627db0092e
|
am ac58dcf1: am f3b10815: am 0849b210: (-s ours) 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 NO
* commit 'ac58dcf14eb46e1b9f36132776fe74d6d996b36c':
|
2013-04-17 19:44:34 -07:00 |
|
Baligh Uddin
|
2b19100ad6
|
am 58a4a153: am a9a84c95: am 3d8f50ea: (-s ours) 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 '58a4a153d1ec5165e13fce307ec29619fb8e3ad4':
|
2013-04-17 19:44:33 -07:00 |
|
Baligh Uddin
|
87ad4a8c5f
|
am b74cc3f9: am 1a24764e: am 03fbe97c: (-s ours) 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-latinimegoog
* commit 'b74cc3f96b6b8eb512e585f0cd0f966ddc909c3a':
|
2013-04-17 19:44:31 -07:00 |
Alan Viverette
|
69ef660fe7
|
am 3de1ae1a: am 849c7858: am eff2ee76: 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 '3de1ae1a6e45fc1aadb3202de411f3b5f81c491c':
|
2013-04-17 19:44:30 -07:00 |
|
Satoshi Kataoka
|
d0642a340f
|
am 775ef9bc: am cb132ce1: am 81295fd2: am 119e6979: am 745725e1: am 103b1118: am 33c91be3: am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname"
* commit '775ef9bc38ee51442190fb30ab2ee77cf9e113d1':
|
2013-04-17 19:44:28 -07:00 |
|
Tadashi G. Takaoka
|
58db8c60a3
|
am c0d71c3b: am 3a2e78f9: am 30d9817b: am 7dcc22b6: am 5f81bb8c: am 3ef47fd3: am e0aa9383: am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import
* commit 'c0d71c3b49d1424174cc728c17726300edfafb6a':
|
2013-04-17 19:44:27 -07:00 |
|
Tadashi G. Takaoka
|
e010bb8ad5
|
am 18be37b0: am 96d53923: am 104923e4: 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 '18be37b0795afb99fa9c9fc7c67d4f36da520fb1':
|
2013-04-17 19:44:26 -07:00 |
|
Satoshi Kataoka
|
8e8ea44848
|
am 9e78d2ba: am 54f46879: am 1af04dc6: am 249ad4d5: am 79376326: am f555b255: am 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"
* commit '9e78d2ba2c7f4247b44983bd081f62937ef4a70f':
|
2013-04-17 19:44:24 -07:00 |
|
Baligh Uddin
|
5bc76be0a7
|
am 15a357a3: am 2060aa13: am 97046d19: 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 '15a357a30db67d37064ad9df8640246a021e1c7c':
|
2013-04-17 19:44:23 -07:00 |
|
Satoshi Kataoka
|
071c3c6d0f
|
am e8374789: am 9e45f9e8: am 24cf39e7: am 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
* commit 'e83747891d122b6eda98f7675c84d4bc54bae65f':
|
2013-04-17 19:44:21 -07:00 |
|
Tadashi G. Takaoka
|
a446f8f7b7
|
am fd06763b: am 7bc7bd79: am 59b23bcf: 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 'fd06763b6a32579f9fbb1fd879b36a3653e9433b':
|
2013-04-17 19:44:19 -07:00 |
|
The Android Open Source Project
|
adef73a7f8
|
am eb2fee1d: am 7db5bfa0: am 20995333: (-s ours) 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
* commit 'eb2fee1da6ccadb21b2f285ff2aa784d9e0e73d8':
|
2013-04-17 19:44:18 -07:00 |
|
Alan Viverette
|
e4f98a02ab
|
am 79ef0a17: am 4b45830a: am 7c9b7f24: 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 '79ef0a17089da3959e3cc6670a53a8ca331f971c':
|
2013-04-17 19:44:16 -07:00 |
|
Jean Chalard
|
b2af86cf0a
|
am c5424013: am 186cf922: am 288deb7a: (-s ours) 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 'c5424013cf87ba6e16b56872bf5560930a53ccea':
|
2013-04-17 19:44:14 -07:00 |
|
Jean Chalard
|
a4156a8e55
|
am 5a59a986: am 2cef4323: am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit '5a59a9868aacedaa9500f574fa65bb906f4574e4':
|
2013-04-17 19:44:13 -07:00 |
|
Baligh Uddin
|
8a0205e249
|
am 2d607977: am e04cee4f: am 49201626: (-s ours) 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 '2d607977f43d177688e9f8692b1cda3b81ed5951':
|
2013-04-17 19:44:12 -07:00 |
|
Baligh Uddin
|
4d085cfa9b
|
am ffb269b1: am 3df28d14: am 14d778b2: (-s ours) am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
* commit 'ffb269b130e31f1023fd5592397f5fb5f09aa8d2':
|
2013-04-17 19:44:11 -07:00 |