Commit Graph

22224 Commits (339b25f904a6621419d74fdc22ce22128ae45ac9)

Author SHA1 Message Date
Jean Chalard 6c7f8ee606 am 4b8c9ff4: am de9442e6: am e0301c75: am c3c1e552: am e8953fde: am 8cfb11b4: am 90e41da5: am eebfe359: am 9df8f3a1: am d0eee16e: am 77f92f70: am 3ea03315: am 9b7fefea: am 6223d823: am c2653d0b: Fix a typo
* commit '4b8c9ff47a8bddb2c627a7df9cc344fa404f9a7c':
2013-10-09 19:42:34 -07:00
Jean Chalard be13594a4d am 9a06cc3d: am a01eafb8: am d66e57c5: am 58b53dd3: am 2c312038: am 0d9aad3d: am e0f0ed22: am 1ed7d94f: am f0e59729: am 5717f5b4: am 0af32078: am 2dc1f0bf: am ba5e450e: am 69ffa8b0: am 03d1dff3: Merge "Fix Binary dict tests"
* commit '9a06cc3d79c05e3437928883f49e6f64122fbd61':
2013-10-09 19:42:31 -07:00
Satoshi Kataoka 02b8b174c1 am ae8fce05: am a94ac381: am 03eb22ed: am 36341d7d: am 18d5cd27: am 524ff4b2: am 4f80a117: am 224a1db9: am 3fb9c290: am f3cdb27d: am 7cb491a8: am 87a3830a: am e157fa50: am 6246b7c3: am a94bb198: fix assertion
* commit 'ae8fce05012d0fa73a96f7da0f97eccf08a5f7e5':
2013-10-09 19:42:29 -07:00
Tadashi G. Takaoka b95a4665e3 am d1955f75: am 843706cc: am 6a5339c0: am 6815f105: am 674630f9: am 73b66655: am 8a703835: am 93e96ad3: am 137591e0: am a7e6a2b0: am 2a279011: am 8af80b3f: am b0d3d86c: am be1232b3: am b12c2af3: Tighten unit test condition of MoreKeysKeyboardBuilder
* commit 'd1955f7584e3f446d4b2fbb66312a3988cffa0f3':
2013-10-09 19:42:27 -07:00
Baligh Uddin bd71081a75 am a48d4b41: am 8c718189: am 78108f78: am c8351c24: am 038aac1c: am 8527cc56: (-s ours) am b541f4a9: (-s ours) am e22f8da1: (-s ours) am 39b1a7dc: (-s ours) am d0b80ed4: (-s ours) am 9fa8fbc8: am 670d8852: (-s ours) am 4793943e: am a270f90a: am dc64866c: (-s ours) am
* commit 'a48d4b419a6709684a7dc4ed415b624a07baa155':
2013-10-09 19:42:24 -07:00
Baligh Uddin abe256594f am 2bfc4e38: am cb92fc2a: am 6fae85d2: am b5a35b6f: am ea696e85: (-s ours) am 3107d241: (-s ours) am b3cb14f7: (-s ours) am 2bac6309: (-s ours) am 96abd37b: (-s ours) am 15047a85: (-s ours) am ce4d1cd5: am c2e36a8f: (-s ours) am 97aa9c40: am a5506b53: am bfedad23: (-s
* commit '2bfc4e382aa4ae96f2e322246d9b271cffee0f14':
2013-10-09 19:42:21 -07:00
Baligh Uddin eec484d8cc am cfb420f7: am 392c2860: am 0010e81c: am 055d0ae7: (-s ours) am c1658257: (-s ours) am b6beb973: (-s ours) am 9f016b5d: (-s ours) am 5b34a371: (-s ours) am f166bdaf: (-s ours) am af0d283b: (-s ours) am 4e12347e: am 931e2530: (-s ours) am 37ac3b3a: am a559e767: (-s ou
* commit 'cfb420f70ff26e9fc399f8e226030f2b77f92b8a':
2013-10-09 19:42:18 -07:00
Tom Ouyang 22662f23f0 am 63e0d692: am 4fb29c25: am dc78da6c: am 1dae8195: am 8ca4d50f: am 69892512: am 09688051: am 829b4db7: am 6e361e44: am bc62c67b: am 0638a632: am 3386a6d7: Merge "Remove duplicate new-word bigram cost (part 1)"
* commit '63e0d6925f18efe25af9831f483ce6e2519d5608':
2013-10-09 19:42:15 -07:00
Kurt Partridge 48280fa811 am 196d933b: am 0981b577: am 8b38866c: am 5696cc3d: am a8f05288: am 5130ebb9: am 7281fb14: am 5c2eb205: am e7386e15: am f61ff3af: am 13b32ee1: am 368427e2: am de51abf1: am bfe5c07f: am ededdc6a: Merge "Avoid NPE"
* commit '196d933b70b0623c04c5320b16e33c5b7c984815':
2013-10-09 19:42:12 -07:00
Jean Chalard a1c8612efa am 690fe5fa: am 195e77a5: am 5c9b731e: am c7cb5124: am ec9b2ea3: am 1771df34: am b86d0a25: am 96f8f9c2: am 548ff78b: am 6d908ce9: am e4e1964f: am d902228e: am f080123d: am 8895e5fb: am 128961ad: Fix failing tests
* commit '690fe5fa788f196ab1f6d946d6688d4d9480ceaf':
2013-10-09 19:42:09 -07:00
Jean Chalard c820b32408 am 96bef214: am 2092247a: am 5c26685c: am a3824a7c: am af9c9351: am 2f26d174: am 94c91022: am 8b715de6: am c2b51cf8: am c1aec8ee: am fd4c38c8: am 5e225afa: am 38011d29: am 41e59b62: am 2cd1136b: Merge "Remove the dialog to insert words to the dictionary."
* commit '96bef214833db1c12e3d4420376bba7890b22550':
2013-10-09 19:42:06 -07:00
Jean Chalard f73081288c am 8cbfe512: am def1591f: am 464148a8: am 3af4a660: am e232ec46: am 1f75c94c: am 46aa843c: am 09f4b598: am 3076b0cd: am 433396e1: am 4d45fbe0: am 5e783427: am 7b81296f: am cb633e37: am 91bcf5eb: Merge "Restart suggestions when the cursor moves."
* commit '8cbfe51259a58fcf670b3baaf7b5191fe91c07be':
2013-10-09 19:42:02 -07:00
Jean Chalard e9004d4e44 am 26bfdbf2: am 9e124819: am bffc6e39: am d71a0330: am d1e46b86: am 883ed059: am 620e2724: am 5c91fb7f: am 00e2c9d2: am 3caf964d: am 6aefd57a: am b8b0ca34: am fda69c44: am 991b1ef8: am 02ce3dc2: Fix a bug with bad application completions
* commit '26bfdbf213f0a44d52d45504f2bd3f14e6965ec2':
2013-10-09 19:41:59 -07:00
Jean Chalard 366eb86c68 am 74be2294: am 68d7a4a5: am ad34a7d4: am 57e35664: am 70cdbd55: am 9acfef11: am b3a47867: am fa75f500: am d78a7952: am abaccadc: am 5184bfe4: am 012dc7f5: am 5351510d: am 68b392cc: am d24f9397: Merge "Make shortcut-only user dict entry non-words."
* commit '74be22943394822489038327a34de670d714ff91':
2013-10-09 19:41:56 -07:00
Jean Chalard 8374f2c8ef am a02b1f40: am 91fa3b5f: am 5722360b: am 0df32cdd: am fc6e3658: am c70156b4: am 6451d473: am 8aab2696: am aadc3209: am 097ec0c0: am 29aa47b1: am ed580a43: am 91290810: am 907a95c2: am fb5869e9: Merge "Add a class to encapsulate getting the metadata URI"
* commit 'a02b1f4010d6021629f805f1d849b129d9ab9f15':
2013-10-09 19:41:52 -07:00
Jean Chalard db93243c78 am ccb2d269: am 436834bf: am 1f5bce49: am f75f8c19: am 6aa41c22: am f4d115f5: am 9c672b53: am 4552b014: am 0d4ade91: am 112db204: am b0c84b8e: am 03c4f795: am fb49fb9e: am 0ea30200: am 676c97eb: Merge "Remove voodoo magic."
* commit 'ccb2d269e55961712f0186af0040b64ad0c33e7d':
2013-10-09 19:41:50 -07:00
Ken Wakasa 14e6fc6a56 am 543f108c: am 8d681818: am f31eb50b: am 1bc04400: am 0c88a606: am 6bc0b184: am 482e6f48: am 04c8a642: am 82b8d414: am 9f272ae6: am 2a3fb325: am eeb23c88: am b78f35de: am 78e61041: am 2daea197: am 47bb8d7d: am 4fffa27d: Fix a native crash in AOSP LatinIME
* commit '543f108c85186a6530c734d396ee0e930428ab74':
2013-10-09 19:41:46 -07:00
Jean Chalard 6de45221df am be4ed1e9: am 5b8dd46c: am bc58383e: am 1625e9b1: am 8036c54d: am ec0bf1ac: am febee11e: am 1dd9aeac: am 14ed8d7a: am f32684ea: am df4e24fe: am 24965bb7: am 5875362b: am 9613be01: am d0623ad7: Merge "Move some values to a place where they are easier to override"
* commit 'be4ed1e94411089638f4830aba6e43e4a70f5ba7':
2013-10-09 19:41:43 -07:00
Kurt Partridge a1c208b04c am d8a9a4d4: am 9213fc4e: am af90ade5: am 7b48fdb1: am a70982ba: am da26964c: am f17b22f3: am ac1d2d7a: am dcad4ed8: am 1015c58b: am 8d58b400: am e8deca68: am a5613e63: am bdce031e: am 2927223e: Merge "Better isolate ResearchLogging data"
* commit 'd8a9a4d4e6fa540d100ad52fb34bba23fb55a378':
2013-10-09 19:41:40 -07:00
Tadashi G. Takaoka ead06c73c8 am 4a332672: am aef4e10c: am e819020b: am 6130bee1: am e0a93a10: am 5e7a962e: am 4f1efa48: am 51f8be38: am 9bae4911: am f3161c20: am 5f68231b: am 2fb79605: am dfc81359: am 3d6b7431: am cd692be1: Merge "Change the default vibration duration to 20msec"
* commit '4a332672bff12e3438217ef357d9c2350e3e07fe':
2013-10-09 19:41:35 -07:00
Jean Chalard 710e795225 am 032fc922: am 48cbf9a5: am 7b2a0cd7: am 5a5fe6dc: am 54bb68cc: am 55af45de: am aa8ed024: am 37e3d1a8: am fe6708a7: am c80e1227: am d25155ce: am c2b8f469: am 27dede24: am 2e4352c5: am b5d5190d: Merge "Add some utility functions."
* commit '032fc922dcaf5c8c36505ac4ce1e547e8b53a499':
2013-10-09 19:41:33 -07:00
Tadashi G. Takaoka dda393c5ee am c218140b: am 3b0c8112: am dbe8d047: am 0f57a049: am de550e1d: am c5a380a2: am 1c18e924: am f4b048ed: am b90bb7ab: am 5b80c6c7: am bef0bb7c: am 253b54df: am 3be1c748: am 05314bf0: am 4f5f81d5: Reorder advanced settings menu
* commit 'c218140b15e2f131e590b00e08653b73221d79c2':
2013-10-09 19:41:30 -07:00
Tadashi G. Takaoka 5a28988021 am af1b0102: am cf9412bd: am 1dd93386: am 45e7fd91: am 096e5ffe: am e84ad7a1: am 850b01de: am c31e9f8c: am 60f20444: am 8ce77079: am ff231781: am eba96f3e: am 46762bf5: am 206ce637: am bd8e92d8: Add debug message to detect unusual zero width condition
* commit 'af1b0102e3673f7677afedd82f1f17abbef65a4c':
2013-10-09 19:41:27 -07:00
Tadashi G. Takaoka 19e623d114 am 4d8d51f3: am ed8f9984: am dd980599: 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 '4d8d51f3090644cc2ea216f563a007c16b4c5015':
2013-10-09 19:41:24 -07:00
Satoshi Kataoka 8ee5e16cf3 am 0b761c50: am 649a971e: am 0c2f096b: 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 '0b761c501f6707bebd9380df33b4f0c07fa31e58':
2013-10-09 19:41:22 -07:00
Tadashi G. Takaoka e118a26f6d am 252a1f0a: am 78abd520: am e904c26b: 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 '252a1f0a2e12fbb103801fc4a4275e9c37f42f02':
2013-10-09 19:41:18 -07:00
Tadashi G. Takaoka c81be0d595 am 11395c79: am 8ba918e0: am 3aec5a7a: 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 '11395c7932d07d2c27a0e154be3c37b0b8b2f122':
2013-10-09 19:41:15 -07:00
Jean Chalard a08d003712 am 502a3112: am 6305684c: am 2cf7c6f7: 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 '502a31127ffc20164f5ce13343a725099a77e7e6':
2013-10-09 19:41:12 -07:00
Baligh Uddin 1142c79ad0 am 979e1b93: am be602bfe: am cc53e47c: 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
* commit '979e1b9315f97798c9d93cb45d153729b945adf1':
2013-10-09 19:41:08 -07:00
Tadashi G. Takaoka 4958bac82b am 9288e229: am a14daaf6: am 582b25e1: 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 '9288e229115bf6d95c2d4b957eb2cc2e5b9da95d':
2013-10-09 19:41:00 -07:00
Jean Chalard df88210e0d am 31949051: am ce233238: am b38f80f3: 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
* commit '319490516b644ab6343ed17c339497a53b4b85ad':
2013-10-09 19:40:57 -07:00
Satoshi Kataoka dace6d7a5d am abade73f: am 5af8897f: am 1319880a: 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 calibr
* commit 'abade73f898b7ffedba538b4f903df0dffb84ceb':
2013-10-09 19:40:54 -07:00
Jean Chalard 2d107d04d4 am 22d6d543: am fd9503c8: am 6467a6c1: 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 '22d6d543fdf2b0345957f168b57914d00b0a1b8e':
2013-10-09 19:40:51 -07:00
Kurt Partridge 0bdc876fb7 am 408d0ad8: am 73729362: am 0d26fba5: 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 replayi
* commit '408d0ad84a87766fd6914a527ba1b68ec63522e3':
2013-10-09 19:40:48 -07:00
Kurt Partridge f082b8c017 am 9ecf47fe: am fb473b5e: am b87e83da: 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 tim
* commit '9ecf47fe52dbc793977c840ef0ca8a14aac938d4':
2013-10-09 19:40:45 -07:00
The Android Open Source Project 94553d5e4c am 750c1853: am f0bfd790: am 48794624: 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 3019a5e
* commit '750c185362bb152cb1b07f9406bb1a7287d499ea':
2013-10-09 19:40:42 -07:00
Ken Wakasa 1d391a68ae am c5134f19: am 3d2bddf3: am 4e1a3e01: 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 'c5134f19b55c221efb197aeba87938d5d209fdb7':
2013-10-09 19:40:39 -07:00
Ken Wakasa 2fbf7b1c5e am d2183af4: am 14576680: am 801ebf4d: 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 'd2183af41af0030e04cf5ddc2ea2833c3e7140f0':
2013-10-09 19:40:36 -07:00
Ken Wakasa cef09103e7 am 86108c3e: am 8e3342a2: am c41da840: 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 '86108c3e3f1eb137d6136373262fc4065ca40472':
2013-10-09 19:40:33 -07:00
Satoshi Kataoka e3703cd056 am 964dc8f7: am 50374c82: am 82467616: 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 '964dc8f7510a06a9367598cc6c22becfbf9aec1f':
2013-10-09 19:40:29 -07:00
Satoshi Kataoka 6b397875cb am f7371b7d: am 7e65243f: am 06c91c6f: 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 'f7371b7d0e131efef01bcf9436c1350d2b652232':
2013-10-09 19:40:26 -07:00
Ken Wakasa ef6487c155 am af5a8894: am cdbbddb4: am 635b1582: 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 unde
* commit 'af5a8894009ab112fcb76ff60c83b7aafecdd0ab':
2013-10-09 19:40:23 -07:00
Jean Chalard 4999875583 am 389d6ec1: am c6de472e: am b28ffdd3: 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 utili
* commit '389d6ec1b2b49a77666cf1cc247545be2cc2301e':
2013-10-09 19:40:20 -07:00
Tom Ouyang 3bff0f4879 am f0288e9f: am a3ceca75: am 5d7e9e9a: 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 'f0288e9f25427d86007d8af4937a8fdcac990f2c':
2013-10-09 19:40:18 -07:00
Ben Cheng 8f788bbb01 am cd07bf94: am 76d69023: am 507e1476: 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 "F
* commit 'cd07bf945be954692af1badce0c864f9b8d79ba5':
2013-10-09 19:40:15 -07:00
Satoshi Kataoka 841b363f89 am 7d850086: am 851fcb7d: am e5d5685d: 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 sug
* commit '7d850086fee9a11315b9168a6155699a57979e22':
2013-10-09 19:40:12 -07:00
Baligh Uddin eb23880920 am 837f62e4: am 2ed34fb7: am bba31722: 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 his
* commit '837f62e45c4fc0f897f555abdb72da9bef63aa83':
2013-10-09 19:40:09 -07:00
Baligh Uddin befe9d5a89 am 55d109b5: am 10e6bc0b: am f2740bac: 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 12db86a
* commit '55d109b5634b85ea3d9d93d2c91c3f518e26fcc3':
2013-10-09 19:40:06 -07:00
The Android Automerger a147cfb81f am 1078d836: am 3e889a4b: am 7d43e52a: 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
* commit '1078d836dd91a1bb2eea04a4790a2d16e816fa29':
2013-10-09 19:40:04 -07:00
Jean Chalard a161da2303 am 57c620cb: am 72dc1256: am 06a0aa28: 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 86880
* commit '57c620cbc056e77f84287c4d7ae8a6d37c131a8f':
2013-10-09 19:40:01 -07:00