Commit Graph

25312 Commits (1e1ac08064edfe78d96dd88d56b9a9a1696758c7)

Author SHA1 Message Date
Jean Chalard 1e1ac08064 am eb8c1723: am 82b77523: am ce8d23d0: am 24877193: am 50261d5c: am f2ce81a8: am 9e590f21: am 88ee75d9: am 7818c9ff: am bab46b4a: am d96f63d2: am e2bee5b1: am ede3db51: Merge "Fix a crash on a secondary user" into jb-mr2-dev
* commit 'eb8c172356502faae53885b661e431e55265ec74':
2013-10-10 00:38:09 -07:00
Baligh Uddin d7af0df8f2 am 266cb86c: am ba77d60c: am efc8ac42: am ee855f42: (-s ours) am 0c8f3292: (-s ours) am 71339df2: (-s ours) am 264c88e4: (-s ours) am ddcca5df: (-s ours) am 13bb5a8a: (-s ours) am 7408a092: (-s ours) am 88fcf65f: (-s ours) am 13d7d568: (-s ours) am 23bff513: Merge "Im
* commit '266cb86cdf97b6e0aea3132e3de3da9ca4b44b28':
2013-10-10 00:38:05 -07:00
Baligh Uddin 70fa30b3f1 am eb898f0e: am b83fa49a: (-s ours) am 08afe099: (-s ours) am 42fb025c: (-s ours) am 5b59a52b: (-s ours) am b1a4c508: (-s ours) am 5410cdad: (-s ours) am 06168df6: (-s ours) am 29ac49d0: (-s ours) am 93125247: (-s ours) am 7f008a62: (-s ours) Merge "Import translation
* commit 'eb898f0e54d8ed3e82bb98907fb553a3a2526c5f':
2013-10-10 00:38:00 -07:00
Baligh Uddin 135e9c297a am 3a84b7e0: (-s ours) am 8319d12a: (-s ours) am 5e803653: (-s ours) am 07b84646: (-s ours) am 50f28828: (-s ours) am 6304d29b: (-s ours) am 90a875ed: (-s ours) am fc6fa43b: (-s ours) am f29ecf9b: (-s ours) am 27ee1f20: (-s ours) Merge "Import translations. DO NOT MERGE" into j
* commit '3a84b7e092c10a03d0a5b37fb3b5d0cb586acb82':
2013-10-10 00:37:56 -07:00
Jean Chalard c3a3dde107 am e91787c9: am 73e82926: am 7cb4daf3: am 5303139b: am 9b6975e9: am fe2cadaf: am 45873fd8: am b993db06: am 9b0bc1d3: am 56dba59a: am 05ea7c5d: am 167ba345: am 89fe1f50: Add a method to work around apps broken by recorrection
* commit 'e91787c9654e10e9e1f74ed4b92f69a035fa43f4':
2013-10-10 00:37:52 -07:00
Tadashi G. Takaoka 08ab79d561 am 4e9338e5: am 42e2e6b2: am 50463682: am 06a31bbf: am acfdcd07: am 048b9be7: am ecff2e4b: am 36ba71fa: am f6a70ad5: am d3cf6715: am a6639636: Merge "Remove unnecessary @UsedForTesting annotation"
* commit '4e9338e5fdba0e25d3a7f3ea403813b19abe7425':
2013-10-10 00:37:47 -07:00
Jean Chalard 1b47111e0d am c56dcf2e: am 018f2a0a: am 5e2f5dd7: am 4e3da8d3: am a386f9fe: am e5a4442a: am edf9db69: am 50a3cfbf: am 5f05a1f3: am 2380f927: am 0013f97d: am 5906b05b: am 7058b02a: Extract a new class for app-specific workarounds.
* commit 'c56dcf2ec4ef57d8a961e5cf94d2bae0a49452f6':
2013-10-10 00:37:43 -07:00
The Android Open Source Project 8d222d50e6 am 31a44f3f: am c0293820: (-s ours) am 8f96cd93: am f3a4b320: am 76319e9a: (-s ours) am 6a1e1b4c: (-s ours) am 39e82fb5: am c9e08527: (-s ours) am 87fa6995: (-s ours) am f8ce1ffa: (-s ours) am eb724ddb: (-s ours) am 7f78bd5e: (-s ours) Reconcile with jb-mr2-release -
* commit '31a44f3f8ec5be1b178462f5e7103d0fb6c57db2':
2013-10-10 00:37:39 -07:00
Kurt Partridge 0e64f18cdd am 498b3da4: am ea641afd: am 2cb223f1: am 638ff458: am b3f48fb1: am ed772e02: am 9ecf1b97: am 7d4c42af: am e348a313: am ec6e5d37: am de4e579c: Merge "Fix punctuation logging"
* commit '498b3da447c37809be1b5a74c5d236eb4f9812e1':
2013-10-10 00:37:34 -07:00
The Android Open Source Project f4302b8d43 am 77bc1bc0: am 5111f8cf: (-s ours) am 36b7da79: am ed60c5f3: am 9edb2a35: (-s ours) am 0503ac42: (-s ours) am 6093b8ef: am 24616eff: (-s ours) am e6098b20: (-s ours) am 265861dc: (-s ours) am 82c852cb: (-s ours) am b528e251: (-s ours) Reconcile with jb-mr2-release -
* commit '77bc1bc032ddb792d9f268bcb389019ebf50a377':
2013-10-10 00:37:29 -07:00
Kurt Partridge 82fea62978 am 127b5470: am e112dfe9: am 31200f85: am 9c11b9b7: am 106660ad: am dd6592ef: am 502d0584: am 2d9093a1: am a9c36271: am f83050d9: am 17b63ba5: Merge "Remove unnecessary commit/uncommit"
* commit '127b5470e4af86f4850bf0550236d9dc5cd6d8dc':
2013-10-10 00:37:25 -07:00
Kurt Partridge d5f21c27a5 am c5921f25: am 213f0177: am 04e00aef: am b253f76e: am fbbb2757: am 883e1117: am 2c6d72d9: am 1ea4319b: am 77907a94: am 577bc298: am 7af5300c: Merge "Add claifying comment"
* commit 'c5921f25b4d977ad167e5261db07fbefe8cc371d':
2013-10-10 00:37:20 -07:00
Jean Chalard 5765b913aa am a460e2d8: am dca9ee47: am 2239e70d: am 5b7ace5a: am fa150a0c: am d662a4b2: am 0f74a347: am 9f405afa: am f7877678: am 9a606af4: am a404e365: am d40b4729: am b1e37e4a: am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
* commit 'a460e2d892b2f0502b1ce36628067837851338fc':
2013-10-10 00:37:16 -07:00
Tadashi G. Takaoka bc8f27bd0d am 7ca2eb20: am c92451d1: am 0b49b1c9: am a06e1810: am 2cec1cd5: am d6ab843d: am 5ed2c649: am 2153eda7: am 22e449c6: am a12f001d: am c3c879ed: am ff0bd7db: am 25f0c808: am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
* commit '7ca2eb20232a7d630b4a8451438434af88b51aff':
2013-10-10 00:37:12 -07:00
Tadashi G. Takaoka d53c96ddea am 4f24bfde: am 0c49cd81: am 49e680df: am c0a8f2b4: am f2bcf774: am ab0f78bb: am 0b6aaf0b: am 0b9b70da: am 40a295dc: am 84828e15: am ad6df987: am d6a7a26d: am d59c1f83: am 50259c70: Merge "Tune layout parameters of setup wizard"
* commit '4f24bfdeca4b84d267aaaf12d1bc80ea70be33a9':
2013-10-10 00:37:08 -07:00
Tadashi G. Takaoka 56e80eccc2 am ce1ab5ad: am a6d41cc5: am f79ec65d: am 80132f1f: am a04dafc6: am 70420b71: am c430cb13: am 7ea5d079: am b3a6419d: am 9e990883: am feb169cb: am e7ef9669: am 7d9bd6f5: am 66b87269: Update welcome fallback image (using xhdpi asset)
* commit 'ce1ab5ad35c5a6317b1e395a4730ee0734da85f7':
2013-10-10 00:37:03 -07:00
Tadashi G. Takaoka a8d7b00033 am ce71048d: am c7d3f33e: am a8b66125: am 110f38b9: am 4710bca3: am f33087a8: am ca01d5f2: am db6591a3: am d4af111f: am aa9d2ae3: am ce0273c2: am 883905f4: am 7fe67544: am 769427cf: Adjust aspect ratio of setup image
* commit 'ce71048d36fb95a1f5ae0953d37cdaec7afc96dd':
2013-10-10 00:36:59 -07:00
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