Commit graph

23782 commits

Author SHA1 Message Date
Tadashi G. Takaoka
4d4e057ade am 83bbc17f: am de0a63f5: am 74909ea4: am 41d9880b: am 661ce373: am 5cdd3721: am bdfc8fbd: am ef8d9d5c: am 007bdf71: am 9f9f296c: am 3c382888: am d2dbbc41: am 104bb70c: Merge "Avoid drawing too long gesture preview trails"
* commit '83bbc17f84506babe5b0d09001bafd826bd1edc0':
2013-10-09 23:04:11 -07:00
Jean Chalard
a3150f1d3c am 7a2532d6: am 9d2515de: am bf0d5bde: am cf9c1673: am 3069f0c3: am 6e83eeb4: am 8e0bb7f3: am d41ba9d4: am 411adbbf: am d19704ed: am d942e6e6: am 0633a208: am 2afe88b8: Merge "Unify space-adding on gestures."
* commit '7a2532d639ccc0714548efb06ea6800fee3bf58a':
2013-10-09 23:04:07 -07:00
Keisuke Kuroynagi
4cf4b68222 am 8c9a74ab: am 1230d882: am 4b68dc9f: am 6ef7e74b: am 4040ecc1: am d5ca85da: am 815e65f8: am 1e16eeda: am 0bb918e5: am d320f201: am 06579eda: am 86af3e9f: am b90a86b3: Merge "Checking key edit distance of candidate words for gesture scoring."
* commit '8c9a74abba53b4ca015efe325e50febac45552d6':
2013-10-09 23:04:04 -07:00
Satoshi Kataoka
847749cc47 am 03edc2d4: am 465b007f: am a30b4c3d: am 02d90683: am 26c610a1: am b5f3e514: am 8d85524f: am 36118a2d: am 41c423f9: am dd1a8597: am 4334809f: am 1e7c0677: am a9dd74cf: refactor spell checker
* commit '03edc2d4d539d856fb811bf56e7d6227675f3eb4':
2013-10-09 23:04:00 -07:00
Tadashi G. Takaoka
612b415bd5 am 044fe607: am 4a076c52: am 09036b2b: am 9cf267ab: am d349453d: am bfcd43ca: am 20acd22d: am bb366847: am 18e6f5fd: am ae0f9e73: am 55b98d25: am 7b6b30df: am 9d71a6c9: Remove unused device form factor values
* commit '044fe60783012c95c7abd2f6616fe14b632813f0':
2013-10-09 23:03:57 -07:00
Tadashi G. Takaoka
4dda8665f8 am ba27a840: am 9e207a98: am fe929763: am 7909ad43: am 62268189: am 3449a2d8: am bb978fe5: am 36bb8a9c: am 3a20d7ab: am d7ed39f6: am 710a12e3: am d192dd94: am 84ac8f31: Move empty listner to KeyboardActionListener.Adapter
* commit 'ba27a84051006b073e78a18672d5e161825853b0':
2013-10-09 23:03:53 -07:00
Tadashi G. Takaoka
e0ce75f79f am 0043af67: am 622a92a3: am 131f6933: am 4eaf6142: am 8a20bea5: am 3f5daa0f: am 82a3df5b: am f3c28421: am 99f977c4: am 734617db: am 066a445f: am 0500edcc: am 40eb31be: Merge "Clean up unused static variable"
* commit '0043af6744ab73b3e99141b2ca9056381a08ff46':
2013-10-09 23:03:49 -07:00
Satoshi Kataoka
c66968a1b0 am b2933098: am 55d216ff: am abb479e9: am ecbcbee0: am 3f06f11f: am e9c7c297: am c3cc8fd3: am 06edf269: am 132d8910: am 33dac33f: am c8187713: am 221d37d7: am d430c92d: Merge "Fix exact match profanity"
* commit 'b2933098d34c2d6217b197e9f514280fd6ba7b6a':
2013-10-09 23:03:47 -07:00
Tadashi G. Takaoka
d76a104b39 am 41867718: am 935f8854: am 31064eb1: am b475ee42: am 2cd524b6: am 69892196: am f4130842: am 80877f52: am eae16583: am cadb19e3: am bbc91a06: am c8dcf48e: am ce67b416: Record down point as gesture preview trail for sure
* commit '41867718c40410ef0acb8414499538c2c964884b':
2013-10-09 23:03:43 -07:00
Tadashi G. Takaoka
0bfbf78737 am 0bc149a4: am 05641a56: am fd380549: am 605febc6: am 368ee87a: am ac1c9b25: am 6d7fcf2b: am e25f6ef1: am 7018cced: am d227ab29: am 7afc241d: am 7a926b3c: am 4ddf1e47: Remove unused gesture preview trail code
* commit '0bc149a4fb984f76e30207d22568dfde74b929b2':
2013-10-09 23:03:39 -07:00
Baligh Uddin
bd7effe5f3 am e0d8f760: am 8bbbd145: am 87e80122: am 5c272208: (-s ours) am d90eaddd: (-s ours) am f5def65b: (-s ours) am a0ae25fe: (-s ours) am ea705d86: (-s ours) am d887218a: (-s ours) am c9ac1129: (-s ours) am 51d694fb: (-s ours) am 83973d45: am c7588446: (-s ours) Merge "Im
* commit 'e0d8f760f8c482c9c50cbd4e7b449bc6aa194269':
2013-10-09 23:03:36 -07:00
Baligh Uddin
7b5e05b89b am 8bd6b343: am 3c00b411: am e7ce2264: (-s ours) am 86022aea: (-s ours) am f4d8953d: (-s ours) am caa6559a: (-s ours) am 01e02bc0: (-s ours) am 894f0dd9: (-s ours) am c97c335b: (-s ours) am dff92757: (-s ours) am e29d2e82: (-s ours) am eb4f9744: (-s ours) Merge "Impor
* commit '8bd6b343b231da7f2d3f3beea3d943d0cbb811fc':
2013-10-09 23:03:33 -07:00
Baligh Uddin
58f998a4f7 am ab7873c2: am a8b10246: am d77fabbd: am 4c93f0d4: am b2675eab: (-s ours) am 4af94918: (-s ours) am f33c0f4d: (-s ours) am da57c7ec: (-s ours) am 9a12a8a8: (-s ours) am 56fc9418: (-s ours) am 6d4914c7: (-s ours) am b9efe4b5: am 458bfeea: (-s ours) am a8478986: (-s ou
* commit 'ab7873c2494c7e6bdb642e27efe901c072866d58':
2013-10-09 23:03:29 -07:00
Baligh Uddin
c6e4ea1151 am 61154603: am b3cb0018: am 185a8a6b: (-s ours) am 341ed610: (-s ours) am 2add0c4a: (-s ours) am 4d1fb901: (-s ours) am 97bf8615: (-s ours) am 97f41e33: (-s ours) am 09ba54ac: (-s ours) am 61154e65: (-s ours) am 69a861b1: (-s ours) am b7065916: am dd8197bc: (-s ours)
* commit '611546036a18b07d4a4185f97fd45bd43baed35c':
2013-10-09 23:03:26 -07:00
Baligh Uddin
b8436f2e7d am c0ea2b7c: am 33c5c222: am 31e530f1: (-s ours) am 607330c0: (-s ours) am efaf5628: (-s ours) am 205b13a5: (-s ours) am 3f38b651: (-s ours) am 961823f6: (-s ours) am a2df2655: (-s ours) am ae71c5b0: (-s ours) am f3cfc524: (-s ours) am 6939f8dc: (-s ours) Import trans
* commit 'c0ea2b7c8884ed70a7314640624ecb4a910075d7':
2013-10-09 23:03:23 -07:00
Ken Wakasa
27839735b1 am d8f59a22: am 94fa785f: am e8add6a7: am 025bccfe: am 4dc923a0: am 92222c0a: am 0fd373ee: am 863e281d: am db3591a8: am df354cb1: am 6c97d676: am 4c7474d5: am c5a29fa8: Revert "Fix exact match profanity"
* commit 'd8f59a22fe39f835ee9096c588ab9de398c2a6d6':
2013-10-09 23:03:20 -07:00
Tadashi G. Takaoka
4a1b9af9b3 am e30f00fd: am 784ea595: am 80703bbd: am f1a2a974: am 1da1feda: am e5a34868: am b4c9cc63: am d6e17195: am 3fe6c4f4: am 3792fa4b: am 4e8fde00: am a36266dd: am a5be033d: Preserve setup wizard step while orientation change
* commit 'e30f00fd9813fc6542645d55188611b17c0fd410':
2013-10-09 23:03:16 -07:00
Tadashi G. Takaoka
c9a90a9fd0 am 2f767467: am f28d2fd7: am e497a1e3: am 268d298a: am 4bd7d179: am 4ffc9322: am 2097f0d4: am 4dd37bb7: am 4565c8b2: am db92fe62: am 3c93fdc8: am 9bb189f6: am 7d19ab5c: Using int instead of booleans to save keyboard shift state
* commit '2f767467f978072cc4dd9eb79b799c7b00373d7e':
2013-10-09 23:03:12 -07:00
Tadashi G. Takaoka
0e9627b7fa am 18e39765: am a847241d: am edb14be9: am 72cdf3ea: am a390047b: am fef4c342: am 41466ebc: am aac0783f: am 13afe2ca: am 503ab45a: am 62dd1ee3: am 3c1a18c6: am 7f8dd50b: Save automatic shift state while orientation changing
* commit '18e39765bd6ab08a4e3629dec59c098eec5ec48b':
2013-10-09 23:03:08 -07:00
Baligh Uddin
6dfdd90096 am 5e5eb38c: am 59212e9b: am 3497dd42: am 9e98458a: am 158b3c2c: am 31b3a24f: (-s ours) am 6fa88d6e: (-s ours) am d1864bac: (-s ours) am deeaf9ae: (-s ours) am da33179c: (-s ours) am 0a0b9fe2: (-s ours) am 276ed0d6: (-s ours) am 9e0ffd35: (-s ours) am f9a4732e: (-s ou
* commit '5e5eb38c67ddc680aa73f7968fa167d979b4c8ff':
2013-10-09 23:03:05 -07:00
Baligh Uddin
04a96173d6 am 986ffb1e: am d8ab4a4f: am fbcaa181: am a0ba17eb: (-s ours) am d7903e25: (-s ours) am 0c64b713: (-s ours) am 6459733a: (-s ours) am 3d7c4cc1: (-s ours) am bdf7113c: (-s ours) am c7f37218: (-s ours) am bc6fd1a6: (-s ours) am 11d4d240: am 39b3bf8d: (-s ours) Merge "Im
* commit '986ffb1ed9099eac97df5b11dfc72c1b8f72fc42':
2013-10-09 23:03:01 -07:00
Baligh Uddin
f87c516c93 am 4748dde7: am eb19da16: am abe3f2ff: (-s ours) am d72b5944: (-s ours) am 1110bd5d: (-s ours) am 5ee45793: (-s ours) am cf904030: (-s ours) am 5a8c2fac: (-s ours) am 62bf6fa5: (-s ours) am 0ffe46a1: (-s ours) am a8fb8b4b: (-s ours) am e351e10a: Merge "Import translat
* commit '4748dde7e7ff9c7dbb4ed9466fbb47c855962b01':
2013-10-09 23:02:58 -07:00
Baligh Uddin
2a916374ed am d0ff18ca: am d72a28a2: am a047d6c7: (-s ours) am e1fd5de3: (-s ours) am 4fe1f32a: (-s ours) am 95be27fd: (-s ours) am 70a09b36: (-s ours) am 5aab3bb3: (-s ours) am d72c805d: (-s ours) am a2942457: (-s ours) am 168d43d7: (-s ours) am dde8e9e3: (-s ours) Merge "Impor
* commit 'd0ff18cafc7b9cf56b81b2713637463c0f098fe2':
2013-10-09 23:02:55 -07:00
Tadashi G. Takaoka
3cf0f5533d am af17808c: am f986d323: am 5d0647e3: am efd0cfb8: am 7e9672cf: am 25cbda13: am d19e8451: am 801a8876: am 59b93354: am 2a06798e: am 6600b06c: am cd196fd5: am 307f49b8: Mark some unit tests as @MediumTest
* commit 'af17808c1e43ff901a6d302dfdae945b22cf74bf':
2013-10-09 23:02:51 -07:00
Satoshi Kataoka
8b3f8a913a am 26997ed5: am 0f7b2041: am 25646cd3: am 290be747: (-s ours) am ee96815b: (-s ours) am c7f05e44: am acfbfcbe: (-s ours) am c6d49148: (-s ours) am 8fad5d83: (-s ours) am 6f9617ab: (-s ours) am 77c6d2bb: (-s ours) am 25a713d6: am 11b9f680: (-s ours) am e5daf660: (-s ou
* commit '26997ed55d790ae6878519dc933a9b56408d2908':
2013-10-09 23:02:48 -07:00
Jean Chalard
7772f21c58 am cf532af6: am 0d0489d1: am 12fead22: am 51ed7879: am 6b62c6e9: am 94018741: am b4d9d140: am 6bee71b3: am d0981b0f: am 771b60ba: am e229cd97: am d8e55277: am 83757d43: Merge "Pass blockOffensiveWords as a parameter"
* commit 'cf532af6dddffdbd11149766326aade6ac24e22b':
2013-10-09 23:02:44 -07:00
Ken Wakasa
230ae9e7d0 am 1b56e1a7: am 8052549e: am 36e5a5ce: am c31ce3a5: am 122e4514: am 18c95594: am 1fd7d6b9: am 5b04d8b5: am 43d34fb8: am af1196dd: am f415cc6b: am 56550ee5: am 1490b534: Cleanup -- follow up to Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
* commit '1b56e1a74ca9847874af0acc747907dbad759977':
2013-10-09 23:02:40 -07:00
Satoshi Kataoka
1445ad5577 am c1821fbc: am bdfafecb: am ef59fb91: am e5f448bb: am 7438e6bc: am ef95a3d0: am 17c8d766: am ee180b02: am f00f84a7: am 679bff89: am 8781e3b6: am 483fc6f1: am c43417fb: Fix build
* commit 'c1821fbcda6ba9e97dcf5ec304a0f6b77b01d8c4':
2013-10-09 23:02:37 -07:00
Jean Chalard
b9a729e6a5 am 5f0dbdc5: am b6f3e6ee: am e8707d37: am 556601dc: am 143e6f2d: am dd199e6b: am 6adf817f: am fb238e46: am 0c179788: am 1b62da75: am 6b93b185: am 3eee5cd2: am 53b37dc0: Merge "Fix a layout problem for pre-MR2"
* commit '5f0dbdc5156b058c0ee7020cd1ea8ec3d648a75b':
2013-10-09 23:02:33 -07:00
Baligh Uddin
e973000233 am f3aee4ad: am 42b9f1fc: am d990ab52: am aa13c1f0: am 909cbd1f: am e3923e65: am 28685e72: am 7ed4f366: am 6dcfbae4: am 4827a249: am c363302e: Merge commit \'3ac40c6a\' into jb-mr2-dev-plus-aosp
* commit 'f3aee4ad4221414d29b79cea90bcba5e60ab2911':
2013-10-09 23:02:29 -07:00
Tadashi G. Takaoka
b151752cbb am 5e9ff77f: am 959fb50f: am fd46ed1d: am e11061e4: am 747372d5: am d89d9136: am ce5aedf7: am 18ece47e: am fe4cdd12: am 8923d767: am 1e08d3d2: am 6191026c: am 0caf3f6a: Merge "Introduce MoreSuggestionsListener class"
* commit '5e9ff77f854335a2ef9fc32fe5fd576a6c636fe7':
2013-10-09 23:02:26 -07:00
Satoshi Kataoka
df0af5b4a8 am 792f1db8: am ca02610e: am b87f034d: am 5568ca2a: am c4c5d046: am 802d8334: am 50704547: am 4e90125e: am 07806b03: am 1749dba1: am d53fb22a: am fcfa2cb2: am 6314b845: Merge "Add permissions for personalization"
* commit '792f1db81687539d7f16167cbc024596607d6965':
2013-10-09 23:02:22 -07:00
Tadashi G. Takaoka
d87c74f202 am 547b15e0: am 3a0ba7ad: am d64d8afb: am 953a0bfd: am f2b2b69c: am cda685f6: am 7ffb4225: am 1b6271fc: am 95fed887: am 35952d7b: am 2f6851d9: am f405dc87: am 17a35383: Merge "Override View.drawableStateChanged to detect state_pressed"
* commit '547b15e055aa928eb4b48278a9f5d4d625cd3995':
2013-10-09 23:02:19 -07:00
Satoshi Kataoka
fd549c7ad1 am 375ff4ab: am 68f8f838: am b75b70db: am 62833cdf: am 175c3083: am ee7c9e88: am 0788e947: am 6ffd1e66: am 143e628c: am 7f63d12e: am 6cf492e4: am 941b288c: am df2eae6e: Fix exact match profanity
* commit '375ff4ab54af569dd0ebbe3948b054df58979f88':
2013-10-09 23:02:15 -07:00
Tadashi G. Takaoka
43aae1dc66 am 1da6063d: am b5fb9fa2: am f2ea52e2: am 546d1339: am b16017d5: am 8b2a17e9: am 54b1c86d: am 3688ddd2: am 7a0c82b2: am f6cd82d7: am 03fe0cf4: am 3b892164: am 7b2114a4: Display still image when device can\'t play welcome video
* commit '1da6063d69fed2aac679fb9ddeac986374f76870':
2013-10-09 23:02:11 -07:00
Jean Chalard
401b97d4e1 am 425b1efb: am d333c0c8: am d5dca48b: am 3f717593: am 56f10d19: am b04d0337: am aac20e4b: am 31ddb205: am bfdb0fb1: am 457b6ae8: am a10c80fe: am 4aa48aed: am 019c3806: am ace3f3c5: am 25c90e6d: Merge "Don\'t do recorrection when suggestions are off." into jb-mr2-dev
* commit '425b1efb25ecb31e1b0e7dbeb1b765c91667608a':
2013-10-09 23:02:07 -07:00
Baligh Uddin
94fdce8fc5 am 82a6171a: am a4ab746d: am aa4f95a5: am 5c518d61: am c8e34872: (-s ours) am f0136e37: (-s ours) am 5b1fe393: (-s ours) am 5ca69fe4: (-s ours) am 5d9f4081: (-s ours) am 00078f79: (-s ours) am 50925559: (-s ours) am d2ea99b7: am c9f49b88: (-s ours) am b4251873: (-s ou
* commit '82a6171af28723db29a12b547ab3aa0f0577f3c2':
2013-10-09 23:02:03 -07:00
Baligh Uddin
8f53ee0876 am e9d37514: am b2f119ad: am abf5ceac: (-s ours) am caaf5673: (-s ours) am bfb9af84: (-s ours) am bb0a3ccb: (-s ours) am d33c8baf: (-s ours) am 949b2a42: (-s ours) am 7bde4523: (-s ours) am 39afe052: (-s ours) am 6242fca8: (-s ours) am 8daffca0: (-s ours) Merge "Impor
* commit 'e9d375143bf66ff407466b5ca7999615fe7f1e87':
2013-10-09 23:01:59 -07:00
Ken Wakasa
00bd9a95f8 am 43f36656: am eff6bc9b: am 17712198: am b6c34066: am 3acf77cc: am b084305f: am 0c4f934a: am bd326eda: am 8aed26b4: am 4c526225: am 45fe5c34: am 761b5586: am a0b62ece: Merge "Cleanup an unused return value"
* commit '43f36656984ca663e63d5ec5125286f0635fbd30':
2013-10-09 23:01:55 -07:00
Tadashi G. Takaoka
98a18643ce am 3d07e8ce: am 030cfe2b: am 67b3be7c: am d1b73078: am 89e30b73: am edf8a28f: am fb7a2163: am 16a3fb0e: am 53d9ed64: am cfb0c03c: am 24fc5ab6: am f4a03ddc: am 1187ef9a: Merge "Catch error while playing welcome video"
* commit '3d07e8ce1e0ee4d3a3369617f55838632c241f59':
2013-10-09 23:01:52 -07:00
Jean Chalard
ae650f01cc am e15400bb: am aed3c1b2: am fd948aa5: am 0872993f: am eca9d848: am cedc9003: am d3cbd2e4: am 15cb1a36: am 40736750: am 8e32cc2a: am 9db1f6d9: am d618419d: am 37bbaea8: Merge "[PB14] Cosmetic fixes to the progress bar"
* commit 'e15400bb7ea79d42cba912986b4063f68d7092bf':
2013-10-09 23:01:49 -07:00
Satoshi Kataoka
702e6fe342 am 6f553c9f: am 103ab089: am e83a3414: am fe7bfd66: am 4bc7b25e: am e3ab2081: am b1f3e3ac: am 6a2f0d10: am 91a1b953: am dc7cff7c: am fa47814c: am f4d7c99c: am 71c1e50f: Merge "Fix the title of the fragment of the personal dictionary"
* commit '6f553c9f8ce2ffdd498a4afe37c1dc9e61b84725':
2013-10-09 23:01:45 -07:00
Jean Chalard
55181b2af1 am d9df7df0: am cf41423b: am b68c30a0: am 7c6bfef1: am 75de987d: am 3461c14c: am 78c33f29: am 6ad83dbe: am c816430a: am 3b765c2b: am bc81ac83: am 69e1e45c: am 01170ffe: [PB13] Actually update the progress bar
* commit 'd9df7df0b73804fa0cb0e02a5efb51c0464f8606':
2013-10-09 23:01:42 -07:00
Tadashi G. Takaoka
4bd93ee7d2 am c0d8dfbc: am 7d421486: am cee6c924: am d7daab08: am e71f8e64: am 9118e605: am e6de3f89: am 0bb5b488: am f10231c4: am 0512fd40: am 58434ae6: am 3bcc7545: am 965329c1: Fix missing string reference of spellchecker.xml
* commit 'c0d8dfbc85fe36a5d57f4accf4662e973db3e69c':
2013-10-09 23:01:38 -07:00
Jean Chalard
0f9da22d71 am 7f5d993e: am e6d4cd58: am eeab52c8: am 20b2c385: am 80fb373c: am 61fb3429: am 90d7024f: am 7ee8e171: am 868a805d: am f022a0d8: am 861d7cea: am 27c91662: am 5f2efe0f: Merge "[PB12] Implement the progress bar update lifecycle"
* commit '7f5d993e4c670adaf1042624c0a1f2f2f16c0747':
2013-10-09 23:01:35 -07:00
Tom Ouyang
890145a6ef am 3fe05558: am 4aa11839: am f4d58139: am 015e87d5: am adfef864: am a7a60f57: am 3848bd3b: am 35f1a518: am ff141440: am 0806d8e5: am f96eb7db: am a0a2b4c2: am 8da0c932: Reduce MAX_NORM_DISTANCE_FOR_EDIT in typing model after recent logic improvements
* commit '3fe055584fe42d8abd485f261049466c3da0c93c':
2013-10-09 23:01:31 -07:00
Keisuke Kuroynagi
4df7e651e4 am 3f42e6d5: am d8d71f9c: am ce914e0b: am 2f6d68bb: am 194a1885: am 318eddae: am fe0603de: am b7a6179e: am e74f3239: am 0da5b5c6: am 45115e6e: am 25a271bc: am 254949d8: Merge "Fix: Demote first char capitalized new words."
* commit '3f42e6d59bc170ba942ed4ede379d22b95f444e5':
2013-10-09 23:01:28 -07:00
Jeff Sharkey
aae2b5f2f9 am dd51f32f: am 9a1f7814: am c62c4091: am 16d4da07: am 48ead228: am 9d32bef2: am 63588c2a: am c5f9c466: am ffc58aa6: am 976eaf61: am f892099b: am 238748d5: am 7a800e79: Merge "Avoid leaking AssetFileDescriptor."
* commit 'dd51f32f1e8901ce7aa1179a8a92c57bf21dc440':
2013-10-09 23:01:24 -07:00
Baligh Uddin
9b3fb92519 am 27831517: am efb5596e: am 21b190b6: am 8ae9e0b5: am 7b08fb38: (-s ours) am 1356f4b0: (-s ours) am 4e5fd8b3: (-s ours) am cafc74b7: (-s ours) am 6d08423a: (-s ours) am 95a2ce5b: (-s ours) am 887d1af1: (-s ours) am 9a60460a: am ed9ef5a7: (-s ours) am af77854a: am 31a
* commit '278315171c8ec47b613201300108c769fda07c1d':
2013-10-09 23:01:21 -07:00
Baligh Uddin
cdf22e56c3 am d743b2ed: am d4711eb4: am a71f07c2: am f2126f3b: am 0913eb42: (-s ours) am 07d6c66a: (-s ours) am 8ac001a8: (-s ours) am b9d3ac50: (-s ours) am 4947c0eb: (-s ours) am 4241b708: (-s ours) am 0adb4270: (-s ours) am edb3fd1f: (-s ours) am fc281601: (-s ours) am 8f4cad
* commit 'd743b2ed2795e8c8144645dfdd95870620e3b690':
2013-10-09 23:01:17 -07:00