Commit Graph

20316 Commits (538b4b253bc2dd8d7621a9e4804641b507d3c1f0)

Author SHA1 Message Date
Tadashi G. Takaoka dd980599e4 am dfa21296: am 4278a089: am 4ddebdaf: am ecbd003a: am f2604bde: am c9b8d7a8: am a8425224: am 2c2dd9e7: am 5cbe78dd: am 1ba1c411: am 93fe83a1: am f67a3881: Merge "Add TypefaceUtils"
* commit 'dfa212969046391ed01e2508f46bdc701442c8dd':
2013-10-03 15:57:26 -07:00
Satoshi Kataoka 0c2f096bf5 am c26225eb: am e7a43a38: am 94bc0eca: am 0b8bf274: am a3742e66: am 44d2f4a2: am a4c26b8a: am da4f353d: am 74f7fb1d: am d0594519: am 4945b656: am 6c7d008e: Merge "add a debug flag to evaluate the most probable string"
* commit 'c26225eb1f7a0ec2959db8faa62ee415c43551e6':
2013-10-03 15:57:23 -07:00
Tadashi G. Takaoka e904c26b30 am f693dd68: am f5010253: am 9d4e9773: am e98ba42b: am e8dd50ad: am 229c7a19: am 663809c9: am 83af8482: am 9b888ca4: am 24b39f16: am 18819688: am 6d0027a4: Merge "Use SparseIntArray instead of TreeMap<Integer, Integer>"
* commit 'f693dd6810e93bb5a9f1c8ac087731401d5453a7':
2013-10-03 15:57:21 -07:00
Tadashi G. Takaoka 3aec5a7a48 am a66b076d: am d218cfc6: am a16c27be: am 45892476: am 9ca372e6: am e2834d8f: am 8aefc778: am 5c6fcf61: am 1c3bc4af: am dabcd969: am 1dc7fd3f: am cee512b6: Merge "More precise geometry checking for more keys keyboard"
* commit 'a66b076da34427cb8c6e9b5fbd44f7f551847f40':
2013-10-03 15:57:18 -07:00
Jean Chalard 2cf7c6f7fd am f729cd38: am 390b0c8d: am 7770839d: am d1f279e0: am 253e5eeb: am bc6f49ba: am 09ddc933: am 852e031c: am 6743a354: am e910a9c9: am b7917ee3: am 3722f087: Merge "Fix two bugs in dicttool"
* commit 'f729cd38aa7f0d9b7af53e59032eae09b0da89ac':
2013-10-03 15:57:15 -07:00
Baligh Uddin cc53e47cb6 am cdfbcf45: am f9641f21: am e765b721: (-s ours) am 36e9a049: (-s ours) am 1e1b2e1d: (-s ours) am a29f9ab9: (-s ours) am 3a2b13a4: (-s ours) am 46ef1ae8: am a4cd9ff5: (-s ours) am 42674ece: am 0afbd6fd: am 269f141b: (-s ours) am cfdc91b9: am 58df3cfa: Import translati
* commit 'cdfbcf454df75755d5ff8bd0ed759321c09ceb28':
2013-10-03 15:57:12 -07:00
Tadashi G. Takaoka 582b25e1cf am 058dc32a: am d396be7d: am d43365d0: am ca2bcde0: am 17424cb0: am ece78ab3: am eefc719f: am 5582d07e: am 47b7fe24: am 330d0330: am e3dcbd80: am ac018da6: am 9620943c: am d9a22235: Hide Setup Wizard icon for stock keyboard
* commit '058dc32a010b47514085137fc4cf2bdc19049a92':
2013-10-03 15:57:10 -07:00
Jean Chalard b38f80f390 am e5b245dc: am 1a9c7aa7: am 259dd5f2: am 0b772ff6: am b4aa5c2a: am e22bdaae: am 1555f75b: am f5214d22: am 0e957017: am cdf19f12: am 9bca1daf: am defd2950: am 1aaaa64d: am 75618c33: am 19dcd154: Merge "Offer to add any OOV typed word to the dictionary."
* commit 'e5b245dc50c13815fbe8fc398ce147f5bc36f79f':
2013-10-03 15:57:07 -07:00
Satoshi Kataoka 1319880a89 am 3dd261fb: am 91ce4fd6: am af11cd57: am af1fa668: am e5fca3d1: am 08474770: am a03026b2: am 8ef42ea5: am 37e9a69f: am 472591fe: am ea8c4731: am d355283f: am fd89cd20: am daef4e8f: am f31553bc: Merge "Fix touch coordinate calibration"
* commit '3dd261fb7b6517758e0480abc40bb71c542c3a46':
2013-10-03 15:57:05 -07:00
Jean Chalard 6467a6c159 am 601106af: am df381f3b: am b7687c79: am a2c6d2e0: am b6f0345e: am a1b9258e: am b907a631: am 6c76c651: am cae4c914: am 0dc8c6e9: am 41ac21dd: am e040aa19: am 0d72a230: am 04bb419c: am ddafcf82: Merge "Fix bugs and add tests"
* commit '601106af1f5db5efda9b2f3c5a39a2d25b94a64c':
2013-10-03 15:57:02 -07:00
Kurt Partridge 0d26fba55c am 2736c06e: am be1e5db5: am 19b75973: am 2fa15f80: am fa0d5038: am 29867576: am 219aca5b: am 0014e8db: am 6225fc10: am 8728b9d6: am 2f7ff3cf: am e2bdf686: am bea42fc5: am 5bd24642: am 1f70a4d6: Merge "Allow logging while replaying"
* commit '2736c06e135b2b5ec667fe9415327eab1ad37b7e':
2013-10-03 15:56:59 -07:00
Kurt Partridge b87e83da29 am faa84ff6: am 07155e26: am d2a6c5b6: am 8bb5f51e: am 84d3c573: am 376766a8: am d7ab90eb: am c922e674: am d01cce40: am 021cf23f: am 5df602b0: am 1944521b: am 41a049a4: am ae144fe9: am d117c1a1: Merge "Do not record log split time when handling separator"
* commit 'faa84ff62c7b2665823b67d533ee26d22a11cce9':
2013-10-03 15:56:56 -07:00
The Android Open Source Project 487946246b am f954815e: am e68a743e: am b87f91ea: am 0f8d55bc: am d6b083a8: (-s ours) am c7b33b10: (-s ours) am 24051f14: (-s ours) am a2319920: am d31bb0b2: (-s ours) am 5761746e: am 3d399706: am c89354b9: (-s ours) am fb899d85: am 3019a5e1: am a8d29082: (-s ours) am d5c8247f:
* commit 'f954815eb49ca9ba884d880a8eab3ea50e04c988':
2013-10-03 15:56:53 -07:00
Ken Wakasa 4e1a3e0152 am e37b2f9c: am 33bccd46: am c18d6bc4: am a14a3927: am e678f6fb: am a41c9bfb: am 00c01f78: am 0c61a0a0: am afdeefb5: am e295aee8: am b1f51ca0: am d01118ae: am 4c896a2f: am f71b9640: am d17c8bd9: Update comments
* commit 'e37b2f9c12af77cac37d817d9ab4e3763c23cdd5':
2013-10-03 15:56:50 -07:00
Ken Wakasa 801ebf4d84 am 2a5a3aae: am c1deb049: am c80a55b8: am 6745f5b2: am f1b03bb0: am 9c006482: am e191316a: am cef20a89: am 3d85683a: am 14eb5e37: am 42eafd44: am 3f55a951: am b3cf23de: am a271f165: am 31f42ba0: Tiny clean up in Makefile
* commit '2a5a3aaeba16e196ecde35f951bd7a34b92c34bd':
2013-10-03 15:56:47 -07:00
Ken Wakasa c41da84091 am 607b6eb3: am b32dad1b: am a66cdddb: am c2b30eb6: am fe5b5017: am fa68489d: am 79f07619: am 3c08c17f: am 9b83250e: am 70a66271: am b0a7c47d: am e4d60a2d: am ff730a66: am bc2fd24f: am b68e7344: Cleanup the include paths
* commit '607b6eb3cf86aefd1aad3450bccccec534898eff':
2013-10-03 15:56:45 -07:00
Satoshi Kataoka 824676163c am 60745ed5: am 08bba22f: am d2b67775: am 976e82f8: am 1cbd9f27: am 09d9c3a2: am 98a90cf1: am 8e3586df: am 8ff8b9c5: am 285de8bb: am a6e4ff7a: am c7d4f502: am c7e1caac: am cd0984a4: am e320789a: Suppress bigram native log
* commit '60745ed50648761b8c3d15d20d81f49a55ac6fb0':
2013-10-03 15:56:41 -07:00
Satoshi Kataoka 06c91c6f61 am bc763433: am e10ec002: am 41da7f73: am 4d4deb62: am 60764a91: am b51feb91: am f89e74a7: am 9cc79ba5: am 79305b2e: am eb8ecdc3: am f17c4e65: am 23b62c93: am 40d8b652: am dfb680c4: am f5e18e99: Merge "Cleanup suggest interface"
* commit 'bc763433a8e67a22592a6d5796f948f86a71918c':
2013-10-03 15:56:39 -07:00
Ken Wakasa 635b158241 am 3608f732: am ba76215e: am 172749c5: am 21c40b2b: am 8c1b351c: am e80026c1: am 7c7640f1: am 3ba4425b: am e4a8b944: am e950a617: am b66b928a: am 1c9da7af: am 34cff46a: am ed8fd94e: am 370461ef: Clean up a few option strings under the Advanced settings
* commit '3608f7325a78740dd6da5eb006dd10ea59f4d27b':
2013-10-03 15:56:36 -07:00
Jean Chalard b28ffdd3b0 am f354cc34: am 6fc428b1: am 0ffe68d8: am 4d9e8522: am 56480370: am c10f63df: am 9ae79c36: am 26acfcfb: am 13b555f1: am a52de59a: am e4678cf9: am 81782419: am 024d0e4a: am f10e7cbe: am e9f69e16: Merge "Move a generic string utility to StringUtils"
* commit 'f354cc345cf492af097b6116143d38bcf6b60972':
2013-10-03 15:56:34 -07:00
Tom Ouyang 5d7e9e9ab2 am 3243a829: am 0481044e: am c968c5e3: am c1636428: am 1220060c: am c5793dfa: am 88bf50a8: am 8aa5cab8: am 5dbfba7c: am b9ae8670: am 281b22bf: am 3c15067b: am 8ab65b8b: am 4096fd08: am 08fd3d95: Merge "Add DigraphUtils class"
* commit '3243a829177f41e5719fd58dd5a7777b6408770a':
2013-10-03 15:56:32 -07:00
Ben Cheng 507e147609 am a2ef8982: am bfeb8aac: am aa7d86c0: am 81a161c6: am 4088debd: am 350d3e3d: am 9804810d: am 864c241f: am 6d9e0bb3: am 3c547048: am 49273f43: am 76293949: am f82a5a24: am 96cb244d: am 65534ffc: am d0c383e1: am 5a4949c2: Merge "Force inlining Correction::isSingleQuote
* commit 'a2ef8982f26e5ece203a45a87f586a86e57cd7c4':
2013-10-03 15:56:29 -07:00
Satoshi Kataoka e5d5685dc5 am f1e40023: am 306dde7b: am 0539b6cc: am 431db2a6: am 63875ee3: am dcebbaae: am ea82b21d: am 79dbeb1c: am 67a53798: am d8c1aaf1: am c086c111: am b3d7d07e: am e90df243: am 481412bb: am f3633e9b: Merge "Add flag to turn on new suggest implementation for typing"
* commit 'f1e40023051755abc5c0c94d505c08c3c225fd43':
2013-10-03 15:56:27 -07:00
Baligh Uddin bba31722a5 am bd9d2c80: am 119a6ad0: am 885ff1b0: am 45f97203: am 7223f9e6: am e8e0d4e2: am 94558219: am 18fd43fc: am 00f6c270: am 351ddb5a: am 90044aab: am 1270880e: am da90ffe0: am 898ec2bf: am 5a5db35d: am 04915a76: am c33a0ab3: keep history after reset to jb-ub-latinimegoogl
* commit 'bd9d2c8011d59184f5e00c13d1478b313674a38c':
2013-10-03 15:56:25 -07:00
Baligh Uddin f2740bac90 am 69271b03: am 77fd6b8f: am e2bbc66d: am fda155a6: am a8982ead: (-s ours) am 873c76fa: (-s ours) am d75db06d: (-s ours) am a4c7b28d: am e0b4b47a: (-s ours) am a276336e: am 2cd45944: am 83c5ec6b: (-s ours) am 005df808: am 12db86a6: am c48fe5d1: (-s ours) am 51a47422:
* commit '69271b0387718a7698a984086cc9e19f62c76d49':
2013-10-03 15:56:22 -07:00
The Android Automerger 7d43e52a47 am e717588d: am f8e0b8a2: am 983b4866: am 16a6f173: am 0c05b276: am 58c53964: am dbca9c71: am 9cfe2a8a: am c3c7712f: am a6ec455e: am f67e7488: am ed19c005: am ddb50fff: am d4b63931: am df35f7dd: am 02dc06a8: am 21484175: merge in jb-ub-latinimegoogle-azuki history aft
* commit 'e717588d23d24efa22f2c52c873f7f1c46744b52':
2013-10-03 15:56:20 -07:00
Jean Chalard 06a0aa2877 am 4a4fb3ad: am 9b3fce87: am 9c5305dc: am 9240d91d: am 01dbd80d: am c451a852: am 96d4f1dc: am a069e8d9: am d981caa7: am e8675585: am 2d6305ca: am 4d21e347: am edf26bee: am d1491741: am 1e1d61d2: am d2a0c614: am b4e2a3bb: am 868805ae: Merge "Change which backdoor the t
* commit '4a4fb3ad7f293b970fd043f204e7511c2ee89a40':
2013-10-03 15:56:17 -07:00
Jean Chalard 0a204ea925 am 465b7d7c: am 14d356d1: am d5e72d74: am 24c5560e: am beac5760: am ffcbb571: am 11aebd5a: am 05a2f21e: am 46c38c6e: am 445d1115: am 7aa9277f: am f6de7890: am 3090e8c8: am b154f10c: am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test."
* commit '465b7d7c3508e4eadae8a85389d1a06b565f953b':
2013-10-03 15:56:14 -07:00
Satoshi Kataoka 99a0fa2fd5 am 6796473b: am 668dc1eb: am 2ddb9422: am 51be4eaf: am 4f9767aa: am 9a4b776d: am 4c8d527f: am 148e15a9: am ab3280f0: 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 '6796473b65771f15957817687794aeceb90c51a4':
2013-10-03 15:56:11 -07:00
Jean Chalard a6738eed25 am cdf0e0d9: am 2f3a1dc4: am 1e11b6fd: am e8d9afc5: am 01ce6e7e: (-s ours) am 1b9de8c5: (-s ours) am d9508378: (-s ours) am 06d8d5fc: am 17e964b1: (-s ours) am ce2a5f93: am 44590a16: am 9d071843: (-s ours) am de19e161: am be9af787: am e405ec76: (-s ours) am 1bd8f332:
* commit 'cdf0e0d9d7c013dbb4b313449963a6a4e68043de':
2013-10-03 15:56:08 -07:00
Jean Chalard 01e53afc46 am d69d9044: am a0a16b0c: am 5fa0e866: am 2a15c64f: 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:
* commit 'd69d9044e976f3676715830c3d2a42803ba2b2eb':
2013-10-03 15:56:06 -07:00
Kurt Partridge e3931b5e8d am 34ee71e9: am 17398eb7: am 21d6a1eb: am c5b6fe56: 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 '34ee71e99cc80ffeda117fe96e763248aa706399':
2013-10-03 15:56:04 -07:00
Baligh Uddin f042c32751 am 9da4cf0e: am 1c294e9b: am 0995977c: am 9b82e15d: 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 0491706
* commit '9da4cf0ee2207c121c8c6fad4fe437f79789bc04':
2013-10-03 15:56:01 -07:00
Baligh Uddin 6aea9a0393 am 1e80b3eb: am 9b4ccd96: am 3455f2bc: am a0a2b9c3: 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 9bf7e74
* commit '1e80b3eb911150d106f544d95d7381ca932b57cc':
2013-10-03 15:55:58 -07:00
Kurt Partridge 37b1d71f6e am 1e0083a8: am 94e38883: am 06917b2f: am 2e70142a: 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 '1e0083a89b1f92fa519ca6df11a8ee343169f391':
2013-10-03 15:55:55 -07:00
Jean Chalard 19a7ef6d51 am 04658027: am e547b53d: am 4b6c72a0: am 2acd9fcd: 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: Deactiva
* commit '04658027bf55a3aeb918c7f76d9f7ab4857efe5a':
2013-10-03 15:55:52 -07:00
Tadashi G. Takaoka 970cd020b1 am 0dad6d90: am 888f6ead: am 855aa95e: am eda828fc: 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
* commit '0dad6d9003a38fb2964a4a7a3ce2667ede232de2':
2013-10-03 15:55:49 -07:00
Satoshi Kataoka 22e1780903 am a1c80285: am cc34a551: am f067287e: am 9feb95cd: 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
* commit 'a1c8028542828d41e5569738cb2f80e3d10c06c2':
2013-10-03 15:55:46 -07:00
Jean Chalard 5f35ef2726 am 9875b776: am 9407a2c0: am f47c3325: am e1500eda: 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 itse
* commit '9875b776120fe097892c474d087b9e170676aff6':
2013-10-03 15:55:43 -07:00
Jean Chalard 26ae6f2aac am d8f0eb0d: am 842d3dc4: am 19bf4335: am 4ab974c1: 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 sur
* commit 'd8f0eb0ddf6ab459cc19b57d4aa9eb1fc19b3768':
2013-10-03 15:55:41 -07:00
Satoshi Kataoka bde031afc6 am d326890b: am d42c151e: am 110d360c: am 693aaa0f: 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 'd326890b28eb9dfe487231092885475d382193f1':
2013-10-03 15:55:39 -07:00
The Android Open Source Project 4bc5b02733 am dae18483: am e82dc760: am fb02270d: am 569ca6b5: 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 c1de
* commit 'dae184832918d77b7e33e6cc401e5e3f5e93dfb1':
2013-10-03 15:55:36 -07:00
Satoshi Kataoka b3d776a1a5 am 8912bd96: am a05e1896: am 9903f419: am 6f9d9e9b: 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 '8912bd96af94cadabfc5a195e08213d61f9c1719':
2013-10-03 15:55:33 -07:00
Jean Chalard fbc9faeb33 am d3e10466: am bbc6f740: am c900edce: am d9a298f4: 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 'd3e104667244a0858ad155d2805c361b4b87eb00':
2013-10-03 15:55:30 -07:00
Tadashi G. Takaoka d1c50150f3 am 9a505159: am 526b6d64: am 4986c095: am 31965739: 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 MainKeyboardV
* commit '9a505159488737afba74dd37220e4912ba31aae0':
2013-10-03 15:55:28 -07:00
Jean Chalard e7dd8c44dd am 00fe5a51: am 60eedd04: am 8e6d5fb0: am 54692476: 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 '00fe5a5181449a2b148b226157087a6f317382b5':
2013-10-03 15:55:26 -07:00
Jean Chalard a4ef89a96d am b56417c7: am 5ac77a53: am ded29a89: am 2a4a2dcf: 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 'b56417c739218c3f83593c9bc8a08725af39913f':
2013-10-03 15:55:24 -07:00
Baligh Uddin 560dc7a949 am 9bc77d35: am 7e36f1c9: am 29ac8dd8: am 3710ff0e: 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 his
* commit '9bc77d35193797708323365c6a208a5be2939576':
2013-10-03 15:55:21 -07:00
Baligh Uddin a7a3f66ab0 am f2bf72c0: am d138dbc6: am d403a860: am 41236d61: 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
* commit 'f2bf72c099212d54a1280b793ba3de143c056ef8':
2013-10-03 15:55:19 -07:00
The Android Automerger 2641757fb0 am 1e16b495: am 4adc4f95: am 6f6db1de: am 6548fea2: 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
* commit '1e16b495e93fe7af04688161f7ed4596c1c569f0':
2013-10-03 15:55:14 -07:00