Commit Graph

16832 Commits (e6de3f89fef66bfdf2aac225b2cff6b33866054f)

Author SHA1 Message Date
Baligh Uddin e765b721bd 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 cfdc91b9: am 58df3cfa: Import translations. DO NOT MERGE
* commit '36e9a04924eddfb1131b380bd9b6ed098a7933d7':
2013-09-26 06:29:05 -07:00
Tadashi G. Takaoka d43365d066 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 'ca2bcde0380288a730106b11fac7a0a8af42b7fe':
2013-09-26 06:29:00 -07:00
Jean Chalard 259dd5f2e2 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 word to the dictionary."
* commit '0b772ff66bd217fb64af415a0f33a9fb59c979fa':
2013-09-26 06:28:55 -07:00
Satoshi Kataoka af11cd5748 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 calibration"
* commit 'af1fa6689f69aae8166aeef26f17dba83d5cf185':
2013-09-26 06:28:50 -07:00
Jean Chalard b7687c79f8 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 'a2c6d2e0eacaea9ce10bbf6c4d6c37fcb1dd7b21':
2013-09-26 06:28:45 -07:00
Kurt Partridge 19b75973a5 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 replaying"
* commit '2fa15f80e92f4c207776e63963f982d2b886b383':
2013-09-26 06:28:40 -07:00
Kurt Partridge d2a6c5b6ba 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 time when handling separator"
* commit '8bb5f51e518e22da5245f7042a0a0fe3abb74554':
2013-09-26 06:28:35 -07:00
The Android Open Source Project b87f91ea39 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 3019a5e1: am a8d29082: (-s ours) am d5c8247f: Reconcile with jb-mr2-release - do not
* commit '0f8d55bc71416bbd924406a11d1dab9d50e61bb1':
2013-09-26 06:28:31 -07:00
Ken Wakasa c18d6bc4b5 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 'a14a392794bcd85cd134852f9c5d19dd18935a34':
2013-09-26 06:28:26 -07:00
Ken Wakasa c80a55b887 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 '6745f5b24027b7b17fd2b730cda39bd9b73f5730':
2013-09-26 06:28:21 -07:00
Ken Wakasa a66cdddb5d 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 'c2b30eb682b5a3ccf20bb46774d6c2ada8477388':
2013-09-26 06:28:07 -07:00
Satoshi Kataoka d2b677755b 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 '976e82f8b56dafd17f09f5ccc9d234ebe5483459':
2013-09-26 06:28:02 -07:00
Satoshi Kataoka 41da7f73e5 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 '4d4deb620e2e4c9dab56627ef859c75a73972476':
2013-09-26 06:27:56 -07:00
Ken Wakasa 172749c59b 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 under the Advanced settings
* commit '21c40b2bec9c2b35a90e77ef8be5f70a9d3ae52a':
2013-09-26 06:27:51 -07:00
Jean Chalard 0ffe68d81c 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 utility to StringUtils"
* commit '4d9e85221d8934c56bd76673b25a3648f7a47719':
2013-09-26 06:27:46 -07:00
Tom Ouyang c968c5e320 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 'c1636428b2eb297ae77a2349fc0cdd7fe814f048':
2013-09-26 06:27:41 -07:00
Ben Cheng aa7d86c006 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 "Force inlining Correction::isSingleQuote" into jb-mr2-dev
* commit '81a161c6808595fb32e68ac29a3c61fa7d10ff3f':
2013-09-26 06:27:36 -07:00
Satoshi Kataoka 0539b6cc4c 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 suggest implementation for typing"
* commit '431db2a6d25b805e26edbd03f402507479a18b7c':
2013-09-26 06:27:31 -07:00
Baligh Uddin 885ff1b06d 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 history after reset to jb-ub-latinimegoogle-azuki
* commit '45f97203b227806a543812ee14003c3d4f940250':
2013-09-26 06:27:26 -07:00
Baligh Uddin e2bbc66d42 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 12db86a6: am c48fe5d1: (-s ours) am 51a47422: am a631cede: Import translations. DO NO
* commit 'fda155a6cc2181650d61ff688af6f913a473bce4':
2013-09-26 06:27:20 -07:00
The Android Automerger 983b4866ef 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 jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit '16a6f173b02439c3f7d830a45a1f29e340f5d4a4':
2013-09-26 06:26:59 -07:00
Jean Chalard 9c5305dc30 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 868805ae: Merge "Change which backdoor the tests goes through"
* commit '9240d91d870810a212eea5522982d6af35e523d0':
2013-09-26 06:26:54 -07:00
Jean Chalard d5e72d74fb am 24c5560e: am beac5760: am ffcbb571: am 11aebd5a: am 05a2f21e: am 46c38c6e: am 445d1115: am 7aa9277f: am f6de7890: am 3090e8c8: am b154f10c: am 310f0dbc: am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test."
* commit '24c5560e69d3343c22eea9a399af1240d942fb4b':
2013-09-26 06:26:48 -07:00
Satoshi Kataoka 2ddb9422fc am 51be4eaf: am 4f9767aa: am 9a4b776d: am 4c8d527f: am 148e15a9: am ab3280f0: am f9d5d101: am 75b099f4: am 23408ee6: am e8f7d669: am 9414d75d: am db377ca6: am 64dd4754: am 63742fe5: am d2a04e1e: Merge "Move typing policy to AOSP"
* commit '51be4eaf1b6c966bb473e168081b8325dec467e1':
2013-09-26 06:26:43 -07:00
Jean Chalard 1e11b6fd8c am e8d9afc5: am 01ce6e7e: (-s ours) am 1b9de8c5: (-s ours) am d9508378: (-s ours) am 06d8d5fc: am 17e964b1: (-s ours) am ce2a5f93: am 44590a16: am 9d071843: (-s ours) am de19e161: am be9af787: am e405ec76: (-s ours) am 1bd8f332: am 6531bcdc: am ecb59eff: (-s ours) Rev
* commit 'e8d9afc580d36e4db0f47e9d62940c9f51bfef7c':
2013-09-26 06:26:38 -07:00
Jean Chalard 5fa0e86674 am 2a15c64f: am d1b59b4e: (-s ours) am f1aae28e: (-s ours) am b7519526: (-s ours) am a2ccaa57: am bd531725: (-s ours) am 01a862fb: am fd59acce: am 5a6b0787: (-s ours) am cb7983e4: am ab6ef3b1: am e1f90dce: (-s ours) am 6b29ef46: am 558f41d4: am c741f1f8: (-s ours) [DO
* commit '2a15c64fbb655f10c6567cd19d56b0a10a6c9ff6':
2013-09-26 06:26:33 -07:00
Kurt Partridge 21d6a1eb92 am c5b6fe56: am 747d95ef: am d804cb42: am 033792b6: am a24564b8: am 4376a55e: am 0f8c86c8: am a3837fd1: am 4c74aaa0: am 5d337ad6: am 0c552106: am 6c9097fa: am 3547bd29: am 228d4533: am 5779bc91: Merge "Split LogUnits differently."
* commit 'c5b6fe569c1aa615e74f67fccd414d96b67b3bf3':
2013-09-26 06:26:28 -07:00
Baligh Uddin 0995977c10 am 9b82e15d: am 9dcd2956: am 6e6e87d5: (-s ours) am bcf54a1e: (-s ours) am 7d5a1369: am 761c188a: (-s ours) am 08f0697b: am 6a7f4639: am 4a41a48f: (-s ours) am 27fede0b: am 5db8119d: am 7022bd23: (-s ours) am 2741e56d: am 0491706a: am 02fc1ed5: (-s ours) Merge "Import
* commit '9b82e15d8c64add727561a965bc0ed08fcfc79c5':
2013-09-26 06:26:23 -07:00
Baligh Uddin 3455f2bc5a am a0a2b9c3: am 34e2eb25: am 4adf7c44: (-s ours) am 87156ef4: (-s ours) am 214d5b2c: am 6f4025d6: (-s ours) am fbc91459: am 6ff63273: am 166b3f98: (-s ours) am f4be7558: am c60d81f5: am a35cea39: (-s ours) am 536e7220: am 9bf7e74d: (-s ours) Merge "Import translations
* commit 'a0a2b9c3b6379b8e0a595fd20370955e6c36ac83':
2013-09-26 06:26:17 -07:00
Kurt Partridge 06917b2f05 am 2e70142a: am 1260923e: am 164e681f: am c9b193c1: am fdf1a05a: am c0486a58: am 3a63e4e3: am 3fcaa3e8: am 1dc4a24f: am 538974d0: am 72c2b423: am ae0c5f79: am 3ec6a8bd: am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call"
* commit '2e70142ae863a62b65bd9d1363373524e767ec38':
2013-09-26 06:26:12 -07:00
Jean Chalard 4b6c72a0bb am 2acd9fcd: am 44800b31: am a05f6c1c: am 2d03ab45: am c633b61e: am dbb031c7: am 56e931de: am feb16b6d: am b8a3454d: am a7da57de: am 3b8d54bf: am 08a5e43d: am 19fe4d4b: am bfd7dcd5: am 0745fe83: am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling.
* commit '2acd9fcd6f80d0f85b0a2b60ae7b15d15df16f5e':
2013-09-26 06:26:07 -07:00
Tadashi G. Takaoka 855aa95e92 am eda828fc: am 77dd85d9: am ea6db9ac: am 254cb1ff: am d13a605c: am 59e17512: am 85fca857: am 300d3bde: am ab99e613: am 8a984e8c: am 2b3f1289: am 06c1baba: am b1533116: am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails"
* commit 'eda828fc53181200b453ae08ac944fdccc2086bb':
2013-09-26 06:26:01 -07:00
Satoshi Kataoka f067287e93 am 9feb95cd: am 718b9f3d: am 053e4ac9: am e406c316: am 85cb23c4: am a08620f1: am eeb38639: am 65690000: am 7d0d728c: am bc36fbfc: am cb4ae59c: am bb229fe1: am 91d468f5: am ac870326: am 54c091d2: Merge "Move policy and session to AOSP"
* commit '9feb95cd6aa1411b1d150357c8ddcc74fb73f416':
2013-09-26 06:25:56 -07:00
Jean Chalard f47c332538 am e1500eda: am bc599f8a: am 42b7bad5: am 114e9c56: am 0eb45d7f: am 484e9144: am e29ffdb6: am c14fdded: am 714b0044: am 2cd99981: am ed66b232: am cffac321: am 873c20ba: am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not"
* commit 'e1500edae6bc0cd76411b8dc7ae2e59ae8a502f4':
2013-09-26 06:25:49 -07:00
Jean Chalard 19bf433578 am 4ab974c1: am a034f847: am ef9ab1c6: am 00f46f03: am 174ddfd4: am 472f764f: am 267e6179: am c26022cf: am d901066b: am f921a587: am 76dda675: am c821c723: am 3b9d7fd1: am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."
* commit '4ab974c154ad39ffecb9c9c4d03d3e8d30b23e68':
2013-09-26 06:25:44 -07:00
Satoshi Kataoka 110d360c68 am 693aaa0f: am fe92ae2d: am 817a43a9: am 94eeba65: am 78ed6232: am a59d936c: am 371369d9: am d196cb64: am 8c485086: am 51805727: am 8348fe8a: am 6f7494e6: am fdf3c49c: am bde25a4a: am 38c26dd0: Move dicnode to AOSP
* commit '693aaa0febccd454f7cdd49121e7f3eaebac9ea5':
2013-09-26 06:25:39 -07:00
The Android Open Source Project fb02270d6a am 569ca6b5: am 6c21cf51: am 7a43a60d: am 6e804061: (-s ours) am 7c4dff90: am 892fcbfb: (-s ours) am e2cc803c: am a0b2dc74: am aeb96805: (-s ours) am cfe49191: am 38a9f856: am 228fcdae: (-s ours) am 70616b63: am 08f5b780: am c1dec87a: (-s ours) am b35915fb: (-s ours)
* commit '569ca6b5badad737cda62c50aae028205e444c5d':
2013-09-26 06:25:34 -07:00
Satoshi Kataoka 9903f41904 am 6f9d9e9b: am 27add2a2: am 175d4e55: am a7885e52: am 3d12edab: am e1829730: am 14175662: am b949db38: am 51c0380f: am d7c3c523: am 7a3bc77b: am b980adab: am a9ef902c: am 70747ad6: am 97a3ce02: Merge "Refactor"
* commit '6f9d9e9bb734051e3d3bd7301a6a6957b0624b40':
2013-09-26 06:25:27 -07:00
Jean Chalard c900edce81 am d9a298f4: am d2564cea: am a1ff71f0: am 840a0695: am 55afe17c: am 783b0862: am 34c0bef6: am 9a181179: am 62e0ee32: am c7163a4c: am 126336be: am 3effa520: am 4c535232: am a38d907b: am 740da0d8: Fix an NPE
* commit 'd9a298f41b262e09f390394280f505830751dbf2':
2013-09-26 06:25:17 -07:00
Tadashi G. Takaoka 4986c09541 am 31965739: am 960a13fe: am 08898684: am 2bc1809d: am e878a277: am a1b05608: am c01de725: am 023ed8a6: am 05ed9c76: am 617362fd: am 1b7451af: am 57a7a5c3: am 76c00dec: am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler
* commit '31965739ea3b890fd6764344690ac91a1f9b0289':
2013-09-26 06:25:12 -07:00
Jean Chalard 8e6d5fb0c2 am 54692476: am ff6f8561: am 615c8b66: am 60368456: am 720ce530: am 9477d7b3: am a6ec1871: am 3f17ab41: am 724e100e: am 84b246f1: am db993a5f: am ae97a93a: am 86b8b7b4: am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE"
* commit '54692476ebeea9f86d62e64c1b934496a28e4c3a':
2013-09-26 06:25:07 -07:00
Jean Chalard ded29a89eb am 2a4a2dcf: am 00f378d6: am 6571290c: am 6e2e946d: am a1187bd0: am 8f89b9b1: am ccb3dc02: am 0eb58dfe: am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
* commit '2a4a2dcf6b868d18514b633dff37d2b344e615f3':
2013-09-26 06:21:47 -07:00
Baligh Uddin 29ac8dd8a8 am 3710ff0e: am d6f1fba4: am 0151b947: am 61076e10: am 04ef4141: am 42f36bb6: am 2456eb3a: am faa708c3: am 36583063: am 8ed884e7: am ca8ea431: am a3ed3254: am 05b7988a: am 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogl
* commit '3710ff0e9125a82fd02ecab6d309606b71eb978e':
2013-09-26 06:21:41 -07:00
Baligh Uddin d403a860c2 am 41236d61: am 2f1f1df4: am f61619af: am 4fd9ca75: am 26e105b6: am 5e79a344: (-s ours) am f205c258: am dbf9168f: am b3fbdd58: (-s ours) am f939332c: am 94065faf: am c6660830: (-s ours) am 68a0afc3: am 0c777365: am fbb6500d: (-s ours) am 5bcbc21a: (-s ours) am c08b824
* commit '41236d61e3d172c7f51fd46aff5a591b2c940ffc':
2013-09-26 06:21:36 -07:00
The Android Automerger 6f6db1de7d am 6548fea2: am 0de714bf: am 1e944609: am f4ed91f5: am 8435a9b8: am abaea38f: am 13ac43b3: am 2cb2c001: am 6e6f705e: am c82a56b4: am ccc3c232: am 228e26f7: am ea46fdcb: am 65dfe94d: am 1237c872: am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history aft
* commit '6548fea280342aca38e13e23115c019cd848d8ae':
2013-09-26 06:21:32 -07:00
Tadashi G. Takaoka 5bab3b1aea am f6073bf0: am d727baf8: am 47846109: am 35c4a834: am 52a89e5a: am c7420082: am f6f20ab2: am 19b5a104: am ae3ead49: am faadc0a7: am b5843222: am 62b07bf9: am 561a04f3: am 1911c513: am abd22393: am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'
* commit 'f6073bf07f4925595a872e86095ac7eab35bce30':
2013-09-26 06:21:21 -07:00
Tadashi G. Takaoka 8e1fb94f9a am 05cede19: am d1c14f6b: am 751cce8d: am 593432e1: am e5561f52: am 707d7d03: am 9a2c21ba: am 6e536321: am 31f350bc: am fc369029: am 9c59fb54: am fc0fc521: am e01d1960: am c17e0bba: am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventT
* commit '05cede19f507f932ba6c379554c5d3babc80b6db':
2013-09-26 06:21:16 -07:00
Satoshi Kataoka 36e702d4c4 am e8b16e6f: am b053083f: am bbc44915: am 4b2cd413: am ef6e62dd: am 1ca78739: am 6a8da44f: am 5d1d7863: am 4b24e49b: am a1cd7970: am 71f1b270: am 8138c8d2: am f4f4d6c9: am b3438173: am d3c823c1: am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"
* commit 'e8b16e6fd81b7bcd7bedcdb3666cc35198d5daf3':
2013-09-26 06:21:11 -07:00
Tadashi G. Takaoka 88b30760b0 am 3a4895f7: am 2a574e0f: am 719e23e1: am 1e02d2cc: am 398c6862: am 8c897819: am b97fe385: am 47d68e5d: am 6ed9580f: am 098ecd55: am 5283b90a: am 60083e3e: am 49d59d4a: am a469cdfe: am d0495a35: am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils
* commit '3a4895f78e3ce777f011be4a07a1b8f9e0da4661':
2013-09-26 06:21:06 -07:00
Baligh Uddin ec32c11610 am 549261fc: am e0a48595: am 38a9550b: am 608d77a1: am 352e94b0: am 13f39210: am ce453840: am 32e84531: am 8632fea5: (-s ours) am 88db1331: am 6626fb25: am 51c7dbea: (-s ours) am 4379dbea: am 324b1880: am f0213d1a: (-s ours) am c1cb4766: (-s ours) am 6537280f: am 5f97
* commit '549261fca36576a3b0a3dceead6e5570bd86221c':
2013-09-26 06:21:01 -07:00