Commit Graph

16346 Commits (9fe58fcc4b6770a0488cdd4d2428e3aa233fb052)

Author SHA1 Message Date
Jean Chalard 2a15c64fbb am d1b59b4e: (-s ours) am f1aae28e: (-s ours) am b7519526: (-s ours) am a2ccaa57: am bd531725: (-s ours) 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 ha
* commit 'd1b59b4ed1e3d12d63ab8ebcfce27de925e2a076':
2013-09-26 02:47:56 -07:00
Kurt Partridge c5b6fe569c am 747d95ef: am d804cb42: am 033792b6: am a24564b8: am 4376a55e: am 0f8c86c8: am a3837fd1: am 4c74aaa0: am 5d337ad6: am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
* commit '747d95ef9fdd1b5c94c3faae90888bd87ea14e87':
2013-09-26 02:44:31 -07:00
Baligh Uddin 9b82e15d8c am 9dcd2956: am 6e6e87d5: (-s ours) am bcf54a1e: (-s ours) am 7d5a1369: am 761c188a: (-s ours) 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
* commit '9dcd2956bc073b94004c4fdcce1e916cc1a5c20b':
2013-09-26 02:44:28 -07:00
Baligh Uddin a0a2b9c3b6 am 34e2eb25: am 4adf7c44: (-s ours) am 87156ef4: (-s ours) am 214d5b2c: am 6f4025d6: (-s ours) 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 MERG
* commit '34e2eb2513692ad8b61be4b6b71416b500143cbe':
2013-09-26 02:44:24 -07:00
Kurt Partridge 2e70142ae8 am 1260923e: am 164e681f: am c9b193c1: am fdf1a05a: am c0486a58: am 3a63e4e3: am 3fcaa3e8: am 1dc4a24f: am 538974d0: am 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call"
* commit '1260923e77c1eb91eacc2fb50ceededd3ed67230':
2013-09-26 02:44:21 -07:00
Jean Chalard 2acd9fcd6f am 44800b31: am a05f6c1c: am 2d03ab45: am c633b61e: am dbb031c7: 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 '44800b312362b1a924c414604e39d0068331cf1c':
2013-09-26 02:44:19 -07:00
Tadashi G. Takaoka eda828fc53 am 77dd85d9: am ea6db9ac: am 254cb1ff: am d13a605c: am 59e17512: am 85fca857: am 300d3bde: am ab99e613: am 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
* commit '77dd85d9a8f4c18cad4d53c6f2e9654723a00320':
2013-09-26 02:44:16 -07:00
Satoshi Kataoka 9feb95cd6a am 718b9f3d: am 053e4ac9: am e406c316: am 85cb23c4: am a08620f1: 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 '718b9f3d551add2e1a4a8d82cca0ccb4b7731aad':
2013-09-26 02:44:12 -07:00
Jean Chalard e1500edae6 am bc599f8a: am 42b7bad5: am 114e9c56: am 0eb45d7f: am 484e9144: 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 'bc599f8ad662767e91a99a74ecf574b63f57c120':
2013-09-26 02:44:09 -07:00
Jean Chalard 4ab974c154 am a034f847: am ef9ab1c6: am 00f46f03: am 174ddfd4: am 472f764f: 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 'a034f847a43bbdd4805394109ea82acd7d1e9859':
2013-09-26 02:44:06 -07:00
Satoshi Kataoka 693aaa0feb am fe92ae2d: am 817a43a9: am 94eeba65: am 78ed6232: am a59d936c: am 371369d9: am d196cb64: am 8c485086: am 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP
* commit 'fe92ae2dc332ee03a6426f02740ed2d54dc5a726':
2013-09-26 02:44:02 -07:00
The Android Open Source Project 569ca6b5ba am 6c21cf51: am 7a43a60d: am 6e804061: (-s ours) am 7c4dff90: am 892fcbfb: (-s ours) 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 wit
* commit '6c21cf5115be994d5b7d2584aec62db297be5c6b':
2013-09-26 02:43:59 -07:00
Satoshi Kataoka 6f9d9e9bb7 am 27add2a2: am 175d4e55: am a7885e52: am 3d12edab: am e1829730: am 14175662: am b949db38: am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor"
* commit '27add2a26b016bf2dec22a1a53e318277e00c542':
2013-09-26 02:43:56 -07:00
Jean Chalard d9a298f41b am d2564cea: am a1ff71f0: am 840a0695: am 55afe17c: am 783b0862: am 34c0bef6: am 9a181179: am 62e0ee32: am c7163a4c: am 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE
* commit 'd2564cea6dff4ff9c919fa0e1e3e2a7e81d921b0':
2013-09-26 02:43:52 -07:00
Tadashi G. Takaoka 31965739ea am 960a13fe: am 08898684: am 2bc1809d: am e878a277: am a1b05608: 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 '960a13fe79071e0e36d45668b6847af13df96da9':
2013-09-26 02:43:49 -07:00
Jean Chalard 54692476eb am ff6f8561: am 615c8b66: am 60368456: am 720ce530: am 9477d7b3: am a6ec1871: am 3f17ab41: am 724e100e: am 84b246f1: am db993a5f: am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE"
* commit 'ff6f85618eb30987c67099494912e20738a6ae0f':
2013-09-26 02:43:46 -07:00
Jean Chalard 2a4a2dcf6b am 00f378d6: am 6571290c: am 6e2e946d: am a1187bd0: am 8f89b9b1: am ccb3dc02: am 0eb58dfe: am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
* commit '00f378d66b2fd1c5b420a6c4590cf2e59e601ac3':
2013-09-26 02:43:43 -07:00
Baligh Uddin 3710ff0e91 am d6f1fba4: am 0151b947: am 61076e10: am 04ef4141: am 42f36bb6: 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 'd6f1fba4c766c9dbabb5d7e1c5ba86ef69565bd0':
2013-09-26 02:43:40 -07:00
Baligh Uddin 41236d61e3 am 2f1f1df4: am f61619af: am 4fd9ca75: am 26e105b6: am 5e79a344: (-s ours) 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)
* commit '2f1f1df43ef3d50dd1a968c0d837b7aca6cda248':
2013-09-26 02:43:32 -07:00
The Android Automerger 6548fea280 am 0de714bf: am 1e944609: am f4ed91f5: am 8435a9b8: am abaea38f: 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 j
* commit '0de714bff3c2a17e92df95ce9c66614bc03f5227':
2013-09-26 02:43:29 -07:00
Tadashi G. Takaoka f6073bf07f am d727baf8: am 47846109: am 35c4a834: am 52a89e5a: am c7420082: 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 'd727baf8e7ff0a702638703c5c1808e1bcaaaefd':
2013-09-26 02:43:26 -07:00
Tadashi G. Takaoka 05cede19f5 am d1c14f6b: am 751cce8d: am 593432e1: am e5561f52: am 707d7d03: 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 'd1c14f6bda2d101b837e2e215aed4d1022f0afe5':
2013-09-26 02:43:22 -07:00
Satoshi Kataoka e8b16e6fd8 am b053083f: am bbc44915: am 4b2cd413: am ef6e62dd: am 1ca78739: 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 'b053083f56b8e4581949bf9e30c68cef86a2f46c':
2013-09-26 02:43:19 -07:00
Tadashi G. Takaoka 3a4895f78e am 2a574e0f: am 719e23e1: am 1e02d2cc: am 398c6862: am 8c897819: 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 '2a574e0f4656a84dd781d6f60dac8a3fae15000f':
2013-09-26 02:43:15 -07:00
Baligh Uddin 549261fca3 am e0a48595: am 38a9550b: am 608d77a1: am 352e94b0: am 13f39210: 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 our
* commit 'e0a48595c278e0077e0c88e710f5f25183f62804':
2013-09-26 02:43:12 -07:00
Baligh Uddin 332264502a am 1ccedccf: am a7e31631: am 32e5224a: am 33a9c2b2: am c346b2dc: (-s ours) 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 6616188
* commit '1ccedccfef4f1e6835f30bd9c5d1451ef2f2bc45':
2013-09-26 02:43:09 -07:00
Baligh Uddin 845818b8ad am 9c981de6: am e83fc873: am db9dbeee: (-s ours) am 8f89ca1d: am b233e047: (-s ours) 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:
* commit '9c981de64d2882abafe51401d683b5921ee87da9':
2013-09-26 02:43:05 -07:00
Tadashi G. Takaoka b120376d7a am fc1b0808: am 19c16d9d: am 2a4ab011: am b53d753d: am d88350e2: 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 'fc1b08089784e4dcb0f2806ebf180abcea30f7a1':
2013-09-26 02:43:02 -07:00
Baligh Uddin a97a8d0ec0 am ce903b44: am bbe52bc6: am a13080d6: am aa52681b: am 627db009: 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 our
* commit 'ce903b44d8cb3a01912d7b10d7b9be0dcf1e6466':
2013-09-26 02:42:58 -07:00
Baligh Uddin 32764875c4 am 9381b26d: am 80c444c9: am 0b6762a1: am 719f8865: am 2b19100a: (-s ours) 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 afe343c
* commit '9381b26de054de3cb13918a4b413835ba1b0e6e4':
2013-09-26 02:42:55 -07:00
Baligh Uddin ae87592ee4 am f91c684c: am c33a6f27: am 768c3c65: am dff9a646: am 87ad4a8c: (-s ours) 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:
* commit 'f91c684cbb9f82ce2f312798b2074860d99fffc6':
2013-09-26 02:42:52 -07:00
Alan Viverette a02c3d8b2e am 12f609e4: am 3dc70862: am 28a831de: am c795a288: am 69ef660f: 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 sam
* commit '12f609e4e25c9b195d3f75d525999115d2ee61f0':
2013-09-26 02:42:49 -07:00
Satoshi Kataoka 5005bcfb12 am 291c9f40: am 363394c9: am 04708a32: am d1935d05: am d0642a34: 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 '291c9f4039305a77c440d148a62bdcd52f94e2a8':
2013-09-26 02:42:46 -07:00
Tadashi G. Takaoka 02ce182689 am c82a6144: am 4a12a2b6: am bfb18559: am 37232a10: am 58db8c60: 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 'c82a614488aeffb2eed9409eae80d53236f6356c':
2013-09-26 02:39:24 -07:00
Tadashi G. Takaoka 71bf7c0f6b am c13ad1dc: am 05e54e59: am 9faf1961: am c1e417dd: am e010bb8a: 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_n
* commit 'c13ad1dcbf67e92b3d686ee0400ff7552fadf273':
2013-09-26 02:39:21 -07:00
Satoshi Kataoka 50d795d9c6 am 6319b0fe: am e0e7b78f: am eecbcea7: am 4bb35fea: am 8e8ea448: 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 '6319b0fe053a459fddf45409746b1f65a10085cf':
2013-09-26 02:39:17 -07:00
Baligh Uddin 276547dab1 am 0bd99dad: am dbff15a9: am af1ca413: am daad9c68: am 5bc76be0: 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 \'525bbe
* commit '0bd99dad3f23195edab740dfa7438a3d42256e89':
2013-09-26 02:39:14 -07:00
Satoshi Kataoka 99b03df6a6 am 75939dc1: am 32d5b4e3: am 29370f41: am 204243c3: am 071c3c6d: 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 '75939dc1650283740b4111720c96be7c4c466a17':
2013-09-26 02:39:10 -07:00
Tadashi G. Takaoka ed4dc25af7 am b9b47104: am e9716016: am 217fe877: am eeb0459e: am a446f8f7: 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 Keyboa
* commit 'b9b471049da708bc0641fc04c05076b5b1979e0e':
2013-09-26 02:39:06 -07:00
The Android Open Source Project 85b8dc48ce am 9faf3e64: am 461a0480: am be7561c2: am 41b61150: am adef73a7: 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 our
* commit '9faf3e6433b05c5e1fe2893d61291b85255b7084':
2013-09-26 02:39:03 -07:00
Alan Viverette 791e37803d am 7ba85ad2: am 74f99743: am 77deeefe: am 3694cc82: am e4f98a02: 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 r
* commit '7ba85ad2222b06cdead4b4c17261ea7d02a68621':
2013-09-26 02:38:59 -07:00
Jean Chalard 1369200c1d am baa4a50b: am 97b579d5: am efd85328: (-s ours) am c825c557: am b2af86cf: (-s ours) 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:
* commit 'baa4a50b6e0cb43d6bb8e32da4c7c0c22ba097bf':
2013-09-26 02:38:56 -07:00
Jean Chalard 24601d1e62 am b12b3b07: am 66833def: am dd0e671a: am 30439651: am a4156a8e: am 5a59a986: am 2cef4323: am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit 'b12b3b07bb2580d14a50817c13cbc326318e3365':
2013-09-26 02:38:53 -07:00
Baligh Uddin 08413e8f1e am 02b8fc7b: am 7916a5d2: am 6da2f050: (-s ours) am 79971a1f: am 8a0205e2: (-s ours) 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:
* commit '02b8fc7b642950c1fb8ae901b1a231f70870afef':
2013-09-26 02:38:49 -07:00
Baligh Uddin e66c1e8504 am e553f0e9: am 7a68cf1e: (-s ours) am 6686f6ee: (-s ours) am ea151032: am 4d085cfa: (-s ours) 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 NO
* commit 'e553f0e93e0c42d75ddca5ab38995d6bffe0f6fa':
2013-09-26 02:38:46 -07:00
Baligh Uddin c3ed8ac566 am 582bbf20: (-s ours) am 39177323: (-s ours) am 4c2b9e46: (-s ours) am e0789c73: am 9ef4b7dd: (-s ours) am bc1bc4d0: am 719e5729: am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
* commit '582bbf205c39aa439ff0fcccb92dbe0a8ae8fc01':
2013-09-26 02:38:43 -07:00
Satoshi Kataoka 8f640acc9a am 207ede4f: am 8af0cc2e: am 9da909d1: am dcfff5c0: am 4109952b: am 7a4430ac: am 5db28826: am b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit '207ede4f2702f25f0be7ee5ce7fc9ff5dc27dd3a':
2013-09-26 02:38:40 -07:00
Satoshi Kataoka 6581aad72d am d0776552: am 795895e1: am f368fdb6: am 3d82dbca: am d3022faf: am 01eb9b25: am 71f828b1: am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit 'd0776552d346afa2af702260a92390842955ccbd':
2013-09-26 02:38:38 -07:00
Kurt Partridge a1c6ad87c4 am 1e5d5eac: am 4d4cb019: am c68eb70a: am 023bee60: am abf64529: am 66366029: am a6092dc8: am 504bbe38: am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit '1e5d5eacff2b3fbcf67ab8cea4601313ca41d29e':
2013-09-26 02:38:35 -07:00
The Android Open Source Project 1b0bfc251d am 83827f33: am 258784da: am 37f22676: (-s ours) am b241b243: am 740243cb: (-s ours) am cf0c1a7d: am 19289df5: am e279de02: (-s ours) am ab6fa041: am e72a088f: am a6dcb55e: (-s ours) am 62adeccd: am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile wit
* commit '83827f3349bd5f6b1e8568e7346826ad86420995':
2013-09-26 02:38:31 -07:00