Commit Graph

26764 Commits (826af47243cd0c8895e9d3b5ed7fc818d8dd4bb5)

Author SHA1 Message Date
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
Tadashi G. Takaoka 25a4891297 am 4d4e057a: 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 '4d4e057ade125090172c0c354a5d3e69f6539ccf':
2013-10-10 00:32:32 -07:00
Jean Chalard f8db7aa6b6 am a3150f1d: 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 'a3150f1d3c70da6ddb05c480d7dcf81389b81260':
2013-10-10 00:32:25 -07:00
Keisuke Kuroynagi 842269b7bf am 4cf4b682: 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 '4cf4b68222e2cd14dce04401416eb923cb503c25':
2013-10-10 00:32:21 -07:00
Satoshi Kataoka 9ed47e1142 am 847749cc: 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 '847749cc478f33cf29ded639ee850b3bff04cadb':
2013-10-10 00:32:10 -07:00
Tadashi G. Takaoka 257040c9ab am 612b415b: 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 '612b415bd5a18d45cd2ab638c300a07ecea73d11':
2013-10-10 00:32:06 -07:00
Tadashi G. Takaoka 270ad96df7 am 4dda8665: 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 '4dda8665f8f6beb65c4c9ec943d2c2cffb6c8fb4':
2013-10-10 00:31:47 -07:00
Tadashi G. Takaoka 03d6c3bc51 am e0ce75f7: 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 'e0ce75f79f5bd64a485120268a334f8104307055':
2013-10-10 00:31:32 -07:00
Satoshi Kataoka 53e2d430ee am c66968a1: 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 'c66968a1b02a479c047581f57e56594561339b91':
2013-10-10 00:31:27 -07:00
Tadashi G. Takaoka 3a3ce909c0 am d76a104b: 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 'd76a104b391d43416b884e9bf3444342dbb28bc9':
2013-10-10 00:31:22 -07:00
Tadashi G. Takaoka 469ea2993e am 0bfbf787: 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 '0bfbf7873781a34fb045ba8103e6acb8653581f5':
2013-10-10 00:31:18 -07:00
Baligh Uddin b0446795e1 am bd7effe5: 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 ou
* commit 'bd7effe5f34bbad3877f39ccc7fdaa25e3b1b4f7':
2013-10-10 00:31:08 -07:00
Baligh Uddin 9e59f02970 am 7b5e05b8: 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)
* commit '7b5e05b89ba4eec7d0034758169815ad1e037268':
2013-10-10 00:31:04 -07:00
Baligh Uddin 1d00f5b932 am 58f998a4: 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 a84
* commit '58f998a4f71eecd25145cd6862fc7e27d3065b8c':
2013-10-10 00:30:59 -07:00
Baligh Uddin 656cdf394b am c6e4ea11: 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 dd8197
* commit 'c6e4ea11510a6ab1dd3f0966daec1f16351dae30':
2013-10-10 00:30:49 -07:00
Baligh Uddin 21226d4553 am b8436f2e: 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)
* commit 'b8436f2e7d795b1a31b2953c49d5661ebef94974':
2013-10-10 00:30:43 -07:00
Ken Wakasa d034fab2e6 am 27839735: 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 '27839735b10f7f79cc2d05565c024e71a48cbecb':
2013-10-10 00:30:39 -07:00
Tadashi G. Takaoka 6c3600e578 am 4a1b9af9: 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 '4a1b9af9b3f1974a05f41fe74c078a85db9943d3':
2013-10-10 00:30:35 -07:00
Tadashi G. Takaoka ea9ed82b6f am c9a90a9f: 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 'c9a90a9fd00c21f54ebb319035a3b49cc0fcab01':
2013-10-10 00:30:30 -07:00
Tadashi G. Takaoka e040659e60 am 0e9627b7: 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 '0e9627b7fa2241bc0bb6f51ebd5691dc3ab09d0d':
2013-10-10 00:30:25 -07:00
Baligh Uddin 88a5caf82c am 6dfdd900: 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 f9a
* commit '6dfdd90096a1a7d0ea58dc9ac24eac6ca48a7ff5':
2013-10-10 00:30:20 -07:00