Commit Graph

25244 Commits (3fbed245e18e641731fb1dc15ceac6c2e51a12ad)

Author SHA1 Message Date
The Android Automerger 3fbed245e1 am 192af66b: am 9968d1ef: am eda81c94: am 8ec81d31: am 61eca494: am 89a457ec: am b4955bdf: am c532c519: am d8ac191f: am 8aec7fad: am e0d3bb2c: am b6161b40: am 66c5f8cb: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit '192af66b3cebaf6ca5b003bd09733e659bb88c1e':
2013-10-10 00:36:54 -07:00
Kurt Partridge 2a42b444ca am 44487edb: am 6963b414: am 5bf37d01: am 307749b2: am e6294b03: am 8f920423: am 3b341f8d: am b78340ba: am ccbb662e: am 6a923429: am ba4e480c: am 39afaf3d: am 6d0f0347: am b2d53be7: Merge "Remove FeedbackLog instance variables."
* commit '44487edb27fa32591544e5bc96de3176f0056b91':
2013-10-10 00:36:50 -07:00
Tadashi G. Takaoka 42def1c03c am 775bf6be: am 2f229498: am c5bd413b: am 73d7ee1b: am 8e1975ca: am 3ba0ce10: am 559a2bee: am 97e4d4b4: am 3cac8bf4: am c1c3df70: am 091bcabf: am 46bf9f49: am 4e3a8afd: am 8b56ad78: Merge "Revise welcome screen video and still image"
* commit '775bf6be75e316df7fdf47801418470b4c672ab0':
2013-10-10 00:36:44 -07:00
Ken Wakasa 704b914904 am f6d53375: am faf21005: am f79c2100: am f7852136: am 71f24d1d: am ca25c610: am de68ec72: am 94ee7b39: am 9da1f073: am 15cec207: am 7a724805: am acb37023: am 23bfac83: am d78c776b: Merge "Adjust sampling interval for gesture stroke drawing a bit."
* commit 'f6d533758b9b765bf646372015bb9f28f7969473':
2013-10-10 00:36:40 -07:00
Ken Wakasa c63d77e933 am d23458bd: am c1b3d981: am 0763e8fa: am 9dab0b2e: am 6e7bd849: am feb308fe: am 0a672d86: am 1f413d84: am 784a961b: am 212798bf: am d8e8b007: am 5ee11c5d: am 2e0fc8bf: am d6d70e73: Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden""
* commit 'd23458bd0dbf44e6d9770513754f4bc08559b620':
2013-10-10 00:36:35 -07:00
Tadashi G. Takaoka c11adafff7 am 8e07c54f: am d5bb0ec8: am 5e5098a2: am 8834818c: am 48ea9f00: am fb7ae63a: am 0601cb49: am b93e782b: am d16eb1a3: am fe84bbd1: am 315e8fac: am 8e7b1739: am 3fff5179: am 41016aca: Back to previous keyboard layout by canceling sliding input
* commit '8e07c54fd69653563a8ed7a4f3a28b72796d8ae8':
2013-10-10 00:36:31 -07:00
Tadashi G. Takaoka df7dee3dcf am abd35989: am 2d86ecd7: am 191daae4: am f98d8a52: am 85adf11d: am 20dfc9e0: am 2ca3986c: am 5a240612: am bcccd22e: am 07ba843c: am 7ab91dfe: am 03f2ca6d: am f46eafe2: am c9398a3b: Merge "Fix PointerTrackerQueue.releaseAllPointerOlderThan"
* commit 'abd359893ffe2990965aa597f76e709c64f2b5a6':
2013-10-10 00:36:27 -07:00
Jean Chalard 483276ae08 am ef61f448: am b501055c: am 547c53de: am fd107261: am 99d1469c: am ec758d69: am 282d9bba: am 002039dd: am 00090e11: am 00d00767: am a1912d14: am 95586abc: am dccad3ef: am cb0d1c4c: Fix isSuggestionsStripVisible when keyboard hidden
* commit 'ef61f448178cb1600323a930509bc0df3f16ba95':
2013-10-10 00:36:23 -07:00
Baligh Uddin 9e25287e0c am ac57ed03: am 76cdedb8: am f5ccc3dd: am 458fcc20: (-s ours) am ad952e0e: (-s ours) am 1f0a9bd4: (-s ours) am 7c3ffb45: (-s ours) am 905f34ff: (-s ours) am 5576afdb: (-s ours) am 7897e758: (-s ours) am d64589b4: (-s ours) am 8587e879: (-s ours) am 5ec5e0b6: am e69066
* commit 'ac57ed03e70ec1fed687d97a162ee730e144b065':
2013-10-10 00:36:14 -07:00
Baligh Uddin 8cbe6b9b84 am 13d3fdc6: am d1956871: am 0cd84b66: am 069abe75: (-s ours) am 23cfda86: (-s ours) am e6f04426: (-s ours) am db1f0ac7: (-s ours) am a5f03a1f: (-s ours) am efcd9c78: (-s ours) am fff0c8a9: (-s ours) am 29cfa87b: (-s ours) am fd2c2e62: (-s ours) am 298d8232: (-s ours)
* commit '13d3fdc642f4be97728be916c38019a0febd1308':
2013-10-10 00:36:09 -07:00
Tadashi G. Takaoka 8dbd6e5f27 am 919623e5: am b9c7848b: am 29e37ab9: am 02d12809: am db0d2254: am ec517ec7: am d0648d66: am 8185b774: am 4e7c1637: am f6270ab2: am b76d1737: am 2d86b73f: am 035c68a1: am b121538e: Tune maximum keypress duration to 100 milliseconds
* commit '919623e5ccac69a63bc3c4bd035b01d121b4c737':
2013-10-10 00:36:04 -07:00
Tadashi G. Takaoka c86dee54f4 am f667e6fe: am d911b72a: am 7554e6de: am 5312bbe0: am 796613fd: am ec462f9f: am 5ced4cf2: am e3748ed9: am a295927b: am c8d6683a: am aeff9902: am 7e52c35d: am 94c54eca: am e8336aa8: Merge "Fix keypress vibration duration of HTC One X"
* commit 'f667e6fe27b4341b17c3bd97c9f369cc540ed83a':
2013-10-10 00:36:00 -07:00
Tadashi G. Takaoka 36da0c6847 am d5437ba9: am f2d89625: am 4339890f: am 7904ab08: am 75c92ad5: am b31c6518: am b1c6ffd3: am 63fc524f: am 61629255: am c05c2526: am 93a1540a: am f1973350: am a70da988: am 5f857a35: Merge "Disable functional key while in sliding input mode"
* commit 'd5437ba9b9bcd9a20fb84c4f76b16edb8ce1e2a3':
2013-10-10 00:35:55 -07:00
Tadashi G. Takaoka 932280e203 am a4793628: am 6b46047d: am 97b3802b: am 61956467: am efb67e07: am 8df36e6c: am 1ba88ee3: am 70912057: am 00204d85: am a0167db8: am 4103044a: am c731457f: am f6b5484d: am b5f67e7f: Add device specific keypress vibration duration database
* commit 'a4793628faadcd5274d1baf4d7eba5e67756c387':
2013-10-10 00:35:51 -07:00
Tadashi G. Takaoka 79fd84242c am 490dedf2: am 53d9eb5b: am 80993791: am b78fcc48: am 19d78a04: am 0d2efd20: am c70c32a4: am 84627c43: am 484545c4: am db40c5d7: am 81fabdb8: am 73673b4c: am f1708394: am 0efd8d1b: Fix landscape override value expression
* commit '490dedf228e60b03e59bba3e2cc51c688fb25fe4':
2013-10-10 00:35:47 -07:00
Tadashi G. Takaoka e98cd1fabd am 52ae409f: am c150a70e: am d60b62b4: am bb0776cf: am 100de3cd: am e0a201be: am 6d20e50f: am df4b9eaa: am ce291bfc: am 6399108c: am 209a97bb: am 7a876b31: am 813ba9f5: am 6b0bcfba: Merge "Disable long press timer while sliding input mode"
* commit '52ae409f21dcf960b0b5706cb70c93a1df3c91f1':
2013-10-10 00:35:43 -07:00
Tadashi G. Takaoka db2da8c5e0 am 84d2042a: am f5928a5b: am 608bf9c0: am cc048ae7: am 604e2bec: am 3ebbd86d: am 3f080835: am db0cc3d5: am a8aa563b: am 4268fdea: am f05eeecc: am 94ad2ef7: am 094447bd: am ad662ade: Disable delete key repeating while in slide input mode
* commit '84d2042a376a2d78be10dc7242cb401392a6f462':
2013-10-10 00:35:39 -07:00
Tadashi G. Takaoka 133df94ee2 am 66464b2d: am 942989c4: am 588ba493: am 9e775acf: am 52aa78ba: am 294b2c17: am 4501c75b: am 1ace0735: am 7ff5db64: am 7c856e16: am cae4cd7b: am 66e5e05f: am 6780e43d: am 18184eac: Support regular expression for condition pattern
* commit '66464b2d3a30f796cdc2b713f7258b1b87bd7b03':
2013-10-10 00:35:34 -07:00
Tadashi G. Takaoka 5e682ab488 am 901513cb: am 6657ad76: am 14cd92a5: am 2a968cfc: am 234bcc72: am aef8af97: am c8a5fe51: am 20d4751f: am a3ec57b3: am de1115a8: am 4c6fe8ed: am aaf7d70b: am 6f647842: am ec83457d: Merge "Support multiple condition for getDeviceOverrideValue"
* commit '901513cb45155d889157d1f6fe8889b280965858':
2013-10-10 00:35:29 -07:00
Ken Wakasa d9e32ebb34 am 7665237c: am e956bb7c: am c2687cfd: am e4e60ed6: am 0ab926e7: am 146acafc: am 184fc484: am 77d61817: am 451b6c3b: am 99effbc0: am 645b62fb: am 8738eeaf: am 01c133d7: am cb3bba3c: Rename GesturePreviewTrail.java -> GestureTrail.java
* commit '7665237cc190e9b15be93975be999f45dd975d41':
2013-10-10 00:35:24 -07:00
Kurt Partridge b4f51faa23 am 9bb483a3: am 4991c75d: am 09c95594: am d2a54da7: am 28cfd8e2: am 0cc0e39b: am 0df768ab: am 54eb5bbb: am 1831d86e: am 772990b6: am 22fa8123: am 7bc99237: am 03a32146: am 7d72ca0b: Avoid JsonWriter multi-write error
* commit '9bb483a38b127b9582a930acfda68dff9d0341e0':
2013-10-10 00:35:19 -07:00
Kurt Partridge 5c76990f86 am 136be480: am fc06b1e9: am c106b23b: am 3c61c0b9: am ec14cded: am 81dde43f: am 95d84f60: am cbbe8f2e: am ceedfcc5: am 1da572e1: am 7c2ca940: am 1e0f8cff: am 697f6abb: am 260df841: Merge "Remove unused code"
* commit '136be480a81828a4d0351f9c6318c22021a2dc10':
2013-10-10 00:35:13 -07:00
Kurt Partridge 25bbcc9e99 am f25e3ec5: am ff0b596b: am 0fc12f21: am 45fae2b2: am 7c772981: am de65abbd: am 011edb32: am 2d82e679: am 2325e858: am 5975a02e: am 28b9aec4: am eaf5c227: am 026b2645: am bb17034f: Merge "Remove ref to LatinImeLogger preference."
* commit 'f25e3ec5c95fecab99e0d1e41dedb6e07ef27f94':
2013-10-10 00:35:09 -07:00
Kurt Partridge 24a0ef9a77 am 97c12f02: am ecb048a7: am fa0e48a3: am a561bc70: am 26e975a6: am 1a0556c3: am 3b601576: am c188bb61: am 548778d3: am 398e03ea: am 3ffe11a5: am 4ee6df8d: am 1f8b354c: am 4135c2db: Merge "Avoid NPE by fixing ResearchLogger initialization"
* commit '97c12f029739713e3bbc1bc5b094aab1939291aa':
2013-10-10 00:35:05 -07:00
Tadashi G. Takaoka c92b9569b9 am c2a6d52a: am 093d5102: am 629ef368: am d61c92b4: am 33402c75: am 710790b0: am 435ded26: am e17d367e: am 38a30fb0: am e3158e93: am aca3b625: am 941e8bba: am a01ab9ea: am 565ced45: Merge "Refactor StringUtils.findPrefixedString to findValueOfKey"
* commit 'c2a6d52a03b1a54640f583cd03df89f4dd994ce8':
2013-10-10 00:34:50 -07:00
Tadashi G. Takaoka 0dc0c58669 am 149473f1: am 7847730e: am 83e8e068: am af699e3a: am 5ee347f7: am faabe9bf: am 53b0617e: am 7ae37424: am 9e533398: am 2ffe29b6: am 4b18d513: am e90fe9c3: am afc40e74: am 4705c0fa: Fix screen flash when launching settings activity
* commit '149473f194ff8ee0e7d2a169755abf38904d3b25':
2013-10-10 00:34:45 -07:00
Tadashi G. Takaoka 33efd5ecfe am 3b758f8b: am cfd5c3a5: am 55b7b9ed: am 9abce57e: am e848e1a4: am bafb5828: am 7184208a: am 575d06f5: am 5e0d0242: am dfd21666: am 82e697bf: am 05aa5e75: am 48002809: am 2b5c9726: Introduce another activity to launch setup wizard
* commit '3b758f8b2161b399434f9f481abe907e8b4d29b9':
2013-10-10 00:34:39 -07:00
Tadashi G. Takaoka 492ad6c378 am fd8572b9: am 24f1eb68: am 76d27afb: am e05c7d4d: am 50666638: am 18ad0562: am 8912e833: am 218ab2a2: am db6feecd: am c7f2031d: am 1784791c: am 82e3ea95: am e7de0ce7: am 5ffa5bf3: Merge "Keep SetupActivity alive to check re-launching from launcher"
* commit 'fd8572b913bc091288d14961e5056081146c20d2':
2013-10-10 00:34:35 -07:00
Jean Chalard 979bd21488 am 6c130684: am 1768286f: am 4793f821: am 9f27c642: am 3d6cdc34: am 76b08e5a: am dd512e68: am 86749e88: am 14a54c67: am b5feac06: am b2e4031e: am 28eab9d5: am 07905b6a: am 2564bd09: Merge "Reuse old preferences if possible."
* commit '6c130684fb61557a15d38cecd5615b95c8dd38bc':
2013-10-10 00:34:30 -07:00
Satoshi Kataoka 553a5f3c33 am e201e29d: am 513fe9f2: am 0011d403: am c917fd4e: am 763140c9: am b912a401: am 6ec1713f: am faeb31e4: am cb3e8f9c: am bcc04608: am 94734c93: am 1884044e: am 81662dd4: am ba35426f: Merge "Tweak a label in the personal dictionary settings"
* commit 'e201e29d57420450a2a7900070ee3efb4f37eec1':
2013-10-10 00:34:26 -07:00
Tadashi G. Takaoka f745687fd1 am f001b13d: am 17ae0947: am 2d0ebd42: am fc3cb872: am 82f32e6e: am 0740e038: am 091210b5: am 206eebbd: am 81b92a35: am 78296e91: am aab8a18b: am 1cb72a09: am 384d4e5b: am 2ad7023c: Fix detecting out of keyboard area
* commit 'f001b13d0c5b3dee5652bbe72c37ca9c7cd39c56':
2013-10-10 00:34:21 -07:00
Baligh Uddin d9b179e6b6 am 8623a8ac: am d0829c9c: am b5f11925: am b1feb913: am eae3e7e2: am 2a0bb1b5: (-s ours) am 18b361fd: (-s ours) am 0998f0d5: (-s ours) am 80698db1: (-s ours) am da09228f: (-s ours) am e31e4a9c: (-s ours) am ad12dfa6: (-s ours) am dfc0adfe: am b0aabbfb: (-s ours) am 8da
* commit '8623a8ac76a653229602d13fab32c600f81c4c26':
2013-10-10 00:34:16 -07:00
Baligh Uddin ea7ca7bd9c am c73d7a39: am b1b6a551: am 5e9d72e6: am f3c4b870: am 30cd82c7: (-s ours) am e931d4ea: (-s ours) am e33214a3: (-s ours) am 117dc6ba: (-s ours) am 0a4f507a: (-s ours) am e313153d: (-s ours) am 9e58ced4: (-s ours) am 86bd88fa: (-s ours) am 0e2f68c9: am 42dc0c25: (-s ou
* commit 'c73d7a39b31f33e3a3191ba48279093c233d5b09':
2013-10-10 00:34:11 -07:00
Baligh Uddin d9e1734f59 am 37157897: am 3b0a08ad: am 627f16a1: am 4c4d20bb: (-s ours) am 43fa288d: (-s ours) am 9a9b2b23: (-s ours) am d2119d79: (-s ours) am e7cf63c5: (-s ours) am 78a2b54a: (-s ours) am a3c48c25: (-s ours) am c78d98e9: (-s ours) am 896767cf: (-s ours) am a45821e6: (-s ours)
* commit '37157897f1199379479e4009bb66e2cdfb84b657':
2013-10-10 00:34:07 -07:00
Satoshi Kataoka 9686858b99 am 1d83300e: am 2181b028: am c6400950: am 0e3e0c4f: am 84836770: am 0a2534ea: am 3d93ba6c: am d5ed336d: am 15ce6934: am 6b3a80e6: am 87abf6f6: am 32866ceb: am 2a383bfe: am 341f1b23: Tweak gesture debug
* commit '1d83300e2bb6acbdf2f22c644a53369aa6515958':
2013-10-10 00:34:03 -07:00
Satoshi Kataoka 04cd8e54c7 am 253773ce: am 5e7c096a: am 26dd47ed: am 5eedcfaf: am 9a23963d: am a522f33d: am 46b39cf1: am 9c82dc48: am 9aba0c14: am cb0df332: am 9135599a: am 41b21c47: am 45c925a9: am 52cb409a: Don\'t resize debug array if production
* commit '253773ce7c4510aaa1fc9405e477f4f9f83a4756':
2013-10-10 00:33:58 -07:00
Satoshi Kataoka a2dc2deba9 am 5a8d58c5: am 09d0a4cc: am f3a1be53: am b8fe0359: am 25e45f69: am a64ef4ca: am 1f9a5e9c: am 7f09a818: am ae789987: am c0a5987a: am 5a846e8f: am 99cccf3d: am 7f9b3e62: am b2c4c730: Add debug facilities for gesture
* commit '5a8d58c5ad6eea77b4a68e998982e1467b7097c8':
2013-10-10 00:33:54 -07:00
Satoshi Kataoka 68f19662cb am 82fd796a: am 07779f9a: am 793a22b9: am 9e365714: am 7a79aa4e: am 676db883: am 5e299e9e: am eec2e9eb: am c479bc81: am 85b82f67: am 9dd800ea: am f5bb5231: am a8254f73: am b9021090: Fix usages of getEnabledInputMethodSubtypeList
* commit '82fd796a8683a9949a2a06b4007954a87bd1bedd':
2013-10-10 00:33:48 -07:00
Tadashi G. Takaoka c2f80eeabf am cce9b31f: am 8cb71ccc: am a8401dae: am 662e23f5: am a322c77f: am 4c9d21f4: am bc13415b: am 8c16fa69: am f4135159: am a95e8368: am feece939: am e8f68d22: am 14c0e4e7: am 499cea94: Use revised Google Keyboard icon
* commit 'cce9b31f78efe3dbe2ddfcbe4ffeb57a375de3f8':
2013-10-10 00:33:43 -07:00
Tadashi G. Takaoka ee45e3fedd am ceaf91d7: am e0465796: am 505b046f: am 2171771e: am 7d8581ee: am 9a4b0f11: am 74ba5d25: am 3ba56b26: am 05a571ad: am 0e56540a: am 5d50556a: am 3da7bdd3: am e868922e: am 3e375863: Launch setup wizard as single top activity
* commit 'ceaf91d787a3e166dd6ead0420bb8ce9b51902cd':
2013-10-10 00:33:39 -07:00
Jean Chalard 298d36a7b8 am 5d8b7704: am 75805181: am f0ad08f1: am be8574e2: am c49cccc0: am fde684e8: am a18a6fd8: am e4a446d2: am e13d3a28: am 7d4030b7: am 2282fcec: am 29177deb: am 114ec4ac: am 71d52474: Merge "Optimizations and safeguards."
* commit '5d8b77047db56629a635ad5cc3ce883043ec77f2':
2013-10-10 00:33:34 -07:00
Jean Chalard d4819de317 am 04663458: am 7b89a68e: am 5092286c: am 9a407ed4: am ba8a511d: am 500fee82: am 0cb45b13: am 8e2ed792: am 17f3ea05: am bfbdfdd4: am 27f3cf5b: am c990ed5e: am 502c041e: am 5064ac88: Merge "Be careful about the dictionary size in detection methods"
* commit '046634581de769322cea5d39e17aac40d15cbd9d':
2013-10-10 00:33:30 -07:00
Satoshi Kataoka dc6faef38e am f1da6347: am b1fc7565: am dcf56743: am 82dfba1b: am d92342c6: am 63be2c22: am 8dc46f7c: am 5487339a: am e6290166: am 829689b0: am 0d997c3f: am e3ca68aa: am 9e5d7abe: am eab27c1e: Merge "Add account e-mail addresses to the user dictionary"
* commit 'f1da6347efe461feabed6613e867636b4bec6235':
2013-10-10 00:33:25 -07:00
Tadashi G. Takaoka a5f7c77f5f am 9061db39: am b40a39f3: am e64b903e: am 0e10dc13: am 3e539be3: am 2dcd913e: am 13acdc83: am 560bfd37: am 6b496cbf: am d2286217: am fcb64160: am bd2aca0b: am c6143574: am 5b8b76ba: Merge "Move gesture preview trail parameters to resource"
* commit '9061db39c0667d79e571e5e2ce7b2cfeae98b2e4':
2013-10-10 00:33:20 -07:00
Satoshi Kataoka 109d88adb8 am 5748d6bd: am dc46142e: am adf05a7c: am 39b01d5b: am bf0eb320: am 9908bc5d: am 4f799337: am 4773a545: am d2ee864e: am d993f92f: am fe55e380: am 1c7a15b5: am eecf34a9: am faa94a2d: Merge "Add owner\'s info to the dictionary"
* commit '5748d6bd6cac63e63e9e3e72d08f61d82e10d38c':
2013-10-10 00:33:16 -07:00
Satoshi Kataoka 5ee6af4c97 am 91d4160d: am 610428b7: am 2a22ab19: am 20599a75: am 89f7f9e3: am 81e6447b: am 3de6e07c: am 9a1be285: am b28f4032: am ec2f54e9: am fbe55eae: am 7fdd3431: am 873f9b90: am 6435c800: Merge "Fix an issue on the transition between the setup and the settings"
* commit '91d4160d303d6e708cedf9c7d49f8dda8b1e00c6':
2013-10-10 00:33:09 -07:00
Satoshi Kataoka f0ecf4150c am 71e2fd6b: am 7ad301e2: am d83d5991: am 568e59d6: am ec786ec2: am d5516fdc: am 0e5797da: am 7121a6cd: am a8df42de: am 0c85a795: am d87fce38: am 7e5e4c85: am fe856be8: am f59c4f68: Fix labels in the personal dictionary settings
* commit '71e2fd6b0949aea1ba68c412d6bbb15a15c72554':
2013-10-10 00:33:04 -07:00
Satoshi Kataoka 39cb72edeb am 9ab97115: am db45038c: am a85ce645: am c053c4b6: am e598a373: am 437d064c: am 7c992669: am 5a7849c2: am 87cfcbcf: am c1381be0: am e93eb247: am a5f0a52d: am 778eabfe: am 244a24e3: Consolidate dummy proximity info to the spell checker info
* commit '9ab971156e2bef7022cf88c55540f7545d99b4f2':
2013-10-10 00:32:48 -07:00
Kurt Partridge dec6e3e945 am d60718c7: am 9789662a: am 2b615b08: am 4db935ea: am 1070a50e: am 318b1dfe: am 7b39521c: am 5c043059: am 20930824: am 59a29cea: am c976add2: am 8facddba: am 9b5965d4: am 1eb1af75: Merge "Fix looping logic bugs."
* commit 'd60718c7ae00af3b3ba598415c5b31cf48e87714':
2013-10-10 00:32:44 -07:00
Baligh Uddin 9fd3ebe486 am ad344c0e: am bea6162e: am 6aa6fae6: am 2146f5c2: am a9a34eb7: am e665c718: (-s ours) am 6420c48c: (-s ours) am 2c43155c: (-s ours) am 4dfe55ff: (-s ours) am bad5fbcb: (-s ours) am 1e6135e2: (-s ours) am 517f7865: (-s ours) am f7937a94: am 542bcbea: (-s ours) am 717
* commit 'ad344c0e57f6c1e03410db00fdcb05b160d94aa7':
2013-10-10 00:32:40 -07:00