Commit Graph

22004 Commits (81262e0d1542b6fa4181b8005464028aacf48a6e)

Author SHA1 Message Date
Jean Chalard 81262e0d15 am 779e28dc: am a7bdb35b: am 51b3fd40: am 00d78b87: am a5283e19: am 9a030f86: am f650f359: am 938fe9b5: am ce957e05: am c436f3a1: am 1a835efc: am ff078041: am f1dde6a1: am 758c74fe: Merge "Fix an NPE in recorrection" into jb-mr2-dev
* commit '779e28dc134727c44de53c3ff9510880f26d4c92':
2013-10-09 19:44:56 -07:00
Jean Chalard bc4268efd9 am a3d2c925: am 4c997f05: am 4e213389: am 2a11dabc: am 2e540372: am c054cd7e: am 4c5753b2: am 32f2ea14: am c6f4f13e: am 7bb6c903: am b7abaafe: am e5cbdfe1: am 3629605b: am 77226ed0: Merge "Fix an NPE in recapitalize" into jb-mr2-dev
* commit 'a3d2c925abd58c4aae619031fc755c22d578ab58':
2013-10-09 19:44:52 -07:00
Tadashi G. Takaoka 4406a25db7 am 86669307: am 7bd53c61: am c9da8866: am 4f44466b: am e610e392: am e4cbf9ec: am 6b6fb329: am 8cff4b77: am 48973cc7: am 8f9a8734: am fc2ca29d: am f10046bd: Remove ScrollView from setup wizard
* commit '8666930791d5c9de131c4e4745daa6c9d14ba54c':
2013-10-09 19:44:49 -07:00
Tadashi G. Takaoka 3cf736358f am 75acd3ff: am ba095b5d: am a8158a9f: am 2a661d8b: am 3cd9c140: am 5e883d06: am fd2ea588: am 59ae862c: am 708e7b0d: am 448b28be: am ed0d1156: am 30f102e2: Move some attributes of setup wizard layouts to style files
* commit '75acd3ffbaf4aef19e1a60ea460ed44c2b5e59bc':
2013-10-09 19:44:46 -07:00
Tadashi G. Takaoka e6044031ef am b2e5e35a: am abd8afa2: am bdcf05b4: am de84d8f9: am 153c0230: am 98db6091: am 38484627: am 10d4986d: am e3407b75: am 64510ad9: am ae19f170: am 1f6e06cf: Merge "Make setup wizard step number highlighted when activated"
* commit 'b2e5e35a8922a54f1bc1d2080f0e44296a139ba6':
2013-10-09 19:44:44 -07:00
Tadashi G. Takaoka efc1ce25b4 am ff69d960: am 0ad7f698: am 2fea38af: am 5c304910: am 06eadd26: am 3a25db77: am db8c29d4: am 4c33e807: am 68067fce: am 8b085e7f: am 7158438a: am 88ee052c: Merge "Update strings of setup wizard"
* commit 'ff69d96032423a5712a48c182b09cb9e6dbe1527':
2013-10-09 19:44:40 -07:00
Baligh Uddin 669bf52a51 am 814d53af: am 47cc6d6e: am 120d48d7: am c4285ab5: (-s ours) am cb5f9318: (-s ours) am 1de7860b: (-s ours) am 8c765113: (-s ours) am 3856755f: (-s ours) am 12b3ae1b: (-s ours) am 97c48a10: (-s ours) am ef70fdd5: am 04211b91: (-s ours) am dcc59297: am 1844bec2: Merge
* commit '814d53af583ae6f1a2aa17d5be00ca2664c95773':
2013-10-09 19:44:38 -07:00
Baligh Uddin 49f045f274 am a7e3c0b1: am 43df4466: (-s ours) am 610aefd5: (-s ours) am 2b17c3bf: (-s ours) am 07aaf165: (-s ours) am d93e39df: (-s ours) am 1d7997ba: (-s ours) am 052034e9: (-s ours) am 9183a408: (-s ours) am 4f87306b: (-s ours) am 3f4d2105: (-s ours) Merge "Import translation
* commit 'a7e3c0b18da2f32b5cd7d244d0678cbc3b879b5c':
2013-10-09 19:44:35 -07:00
Ken Wakasa 1d1d52d371 am e1fa0878: am d493f255: am f1519ba0: am cd7dadb8: am b3fd4401: am afe838e8: am bcba9391: am 73b8411a: am c3425d97: am 3239d7f6: am 4f1a832d: am f02e2693: am 55b306c9: am 64eda4f4: Merge "Fix an infinite loop" into jb-mr2-dev
* commit 'e1fa087879bd5a355210f450b0a82965e40dedea':
2013-10-09 19:44:33 -07:00
Jean Chalard 1f222f8988 am 9a20354e: am d8484f48: am 5ea8667c: am 1060a8a6: am 8eef0934: am c9f4b9fd: am be9d5d71: am b6584a6d: am c5645d67: am 1b1fc5d7: am 936fc9ab: am 3a18ae70: am a5d2da82: am d91268ad: Initialize dictionaries at onStartInputView
* commit '9a20354e1bcf4c06260a5859f0e72a7e4fa5ee75':
2013-10-09 19:44:30 -07:00
Jean Chalard 729f9cbb9a am 5ac65f06: am ce09fd96: am bfe2958f: am a5bbad8f: am 6f835f65: am 7e9f08b1: am 241050a8: am ef2f8ce6: am 0d3d8f53: am 52e0b3d1: am 0e64fbbc: am 9cf46864: Update dictionaries
* commit '5ac65f06d1b81f4ff8fba206c73d1bbd06f4f523':
2013-10-09 19:44:27 -07:00
Tadashi G. Takaoka e696f2de3a am 029c5956: am 5f1c8f9b: am cdc7e24f: am 8c874504: am cd81ac9c: am cc138a5f: am 485dc598: am c2052268: am c9848ad1: am a06fdaad: am 64e87b3e: am 0b2d184a: Merge "Update setup wizard icons"
* commit '029c59564f7a22ef506dedc3428ad55dbad8151b':
2013-10-09 19:44:24 -07:00
Kurt Partridge a9819a1618 am acec9472: am 9d178507: am d6a7426f: am c064f022: am b0055a06: am b410aab6: am 4aeb5601: am 9dcdd3ce: am 70ee9dc1: am 1efcbd67: am 8acab80a: am 56f35a10: Merge "Fix bug in counting words between samples"
* commit 'acec94728f56af30fc16e83724254421bc53966c':
2013-10-09 19:44:22 -07:00
Tadashi G. Takaoka 19b99e7223 am 0a9e4f01: am dbe0aa53: am 5225eed7: am 4004f339: am c2a40f28: am 941056ed: am f3f8735b: am 787085d4: am fd140374: am bec53aa0: am 0163591d: am 550824c7: am 93c31e17: am 530fd15e: Fix bug to update last interpolated index of GestureStroke
* commit '0a9e4f01ad6e27962cda0960436a125a752631bd':
2013-10-09 19:44:15 -07:00
The Android Automerger 8f5ae5b0fb am 96e3ac26: am b8d993e8: am defdb798: am d315a219: am 164f8ac6: am 5f252463: am 96260e92: am b86c20e5: am 67f00c11: am 4e37f65f: am c986021b: am 453c70a2: am 17e55d3b: am 45fd237c: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit '96e3ac269560b911244419009a6c74fcb1a19534':
2013-10-09 19:44:13 -07:00
Tom Ouyang e157a0c312 am 41bc1403: am 3e7ffc01: am c9e301ed: am 11f8a122: am 5ddb483d: am 7b0c6682: am 0b02eff7: am 3777ee6b: am 316908cb: am 48cda918: am af0d19b5: am ac37c939: am 05da1df8: am 880cb618: am 3970352e: Make digraph lookups case insensitive
* commit '41bc1403899927c4be2100e5abd766df931d0796':
2013-10-09 19:44:10 -07:00
Ken Wakasa 329593db39 am e74feb6e: am d2cb668f: am 96375630: am 13f8529a: am 3ca142e8: am 287ec203: am 8d6131b5: am a10783fb: am ce343db9: am 4560a386: am a6058856: am 6aac8ba7: am ad3ebcbd: am ef83a2eb: am e01e22e1: Merge "Update SORTED_CHAR_MAP"
* commit 'e74feb6e458756d5a71f2b1572a09422f747e757':
2013-10-09 19:44:07 -07:00
Jean Chalard cd8f2bce8c am 9f4db8eb: am 0ddf83df: am 45371007: am eaeb55d1: am 39654ba6: am b953b5a0: am 33591fba: am d357269c: am 38a29eb3: am 390318fb: am 910bee79: am f08505af: am 38d52c0a: am a694c9ba: am ff766f8c: Merge "Don\'t insert automatic spaces when text looks like a URL"
* commit '9f4db8ebafbb3246d6bde1d97017c8bad1d07bd7':
2013-10-09 19:44:04 -07:00
Tadashi G. Takaoka b9c0bec141 am 067e7a1f: am 2aa2f32e: am 2d9ad296: am 237f8644: am fa9ed548: am 0eb8f833: am 8e923214: am dcc42bbf: am 2a7c8b90: am b1b9fc03: am f7e2ed72: am 5b30137d: am 38046a0a: am 7abeccfa: am 1711f986: Merge "Add shadow to gesture preview trail"
* commit '067e7a1fb0c10bf2489b7d6e3a410b64d1b94991':
2013-10-09 19:44:01 -07:00
Satoshi Kataoka f7bcd683ba am d4c4bcfc: am bf0a284e: am b894bea7: am bd2d4669: am 46956447: am 53aec98e: am 37d3bcb9: am 4c6b7c50: am 80fade03: am 7e04bf26: am 8fa3fae2: am e1b9653b: am a23e25cc: am 93a429a7: am 252412d7: Use additional multi-word cost per language (for Russian)
* commit 'd4c4bcfca0d8efc638b4e6db1fbf9db0b52c4762':
2013-10-09 19:43:58 -07:00
Jean Chalard 075a69afd3 am 51409817: am 7e2b8662: am bcfa81c9: am 2ec9629e: am af283380: am 91d465ef: am 74d8aa93: am 64820842: am 79a64f35: am d45893bd: am eef11d43: am 52a8f30e: am 7f8e55ec: am c6c17b93: am 962c9f05: Merge "Small cleanup"
* commit '5140981799ca5f71c2010fe3ba7cd685668b0d8f':
2013-10-09 19:43:54 -07:00
Jean Chalard 1c5ee51538 am ffb0b789: am 3dfe4251: am db4a5f5b: am 4db3072a: am f51ba9b9: am 81f5bd1e: am 5d70d126: am a95f6e84: am 4a794aa8: am 7925a5b1: am dae357aa: am 384450f7: am ca796e2d: am aa6924e9: am 78d65873: Merge "Don\'t recapitalize on shift while on symbol layout"
* commit 'ffb0b789afd8e346785bbddcfb01282bdb033efb':
2013-10-09 19:43:51 -07:00
Jean Chalard bee72e92ce am d1a8cc57: am 1b02ec5f: am 047018f4: am fbe18483: am f954d08a: am 1066714b: am d160a485: am dad133b5: am e66d563a: am 07866367: am 97c74e01: am 139f888d: am 074fee65: am cca43825: am 8094bf45: Match the keyboard state to the recapitalize state.
* commit 'd1a8cc57b6cb397a68c2c30c92ea11b3f1639ec1':
2013-10-09 19:43:48 -07:00
Jean Chalard 2bd599c49f am 1c4ebd63: am 2a7591bb: am d6f9468b: am 19131b19: am b8b04bd4: am dd9b651e: am d96cf8fc: am 2769943d: am 49977c64: am 601edb48: am 31ba35f5: am 3398ceef: am fe48f31e: am ced547f7: am e259b9f5: Merge "Clean up RecapitalizeStatus"
* commit '1c4ebd63ae859d073dfea680eb61e0d475f50ec0':
2013-10-09 19:43:45 -07:00
Jean Chalard 58e36bc06d am a06679b2: am f3113e57: am 75efe7dc: am b5bfd0ae: am ac21ae96: am 3401f8b2: am 64165744: am 40e6fb73: am b7ec15c4: am 3257eb72: am ac397601: am 181bbf66: am 57ac9afc: am 8e5c6d70: am fd15686a: Merge "Fix an NPE"
* commit 'a06679b20e30d109388b04914056ef344cd61b50':
2013-10-09 19:43:42 -07:00
Jean Chalard 4646b8e3a3 am 5cb7b09e: am 55180eec: am 5f37a8ee: am aedb16a2: am 14727224: am 008005e7: am 5adbdf2c: am f2ba6bac: am fcafe40e: am 9e17bb32: am 9c7fe5d3: am 76ffd719: am 5557bf5b: am 10800d4b: am a024ac6b: Merge "Fix an NPE"
* commit '5cb7b09e8061a193dd37f6e9fb9ede20ee7713c7':
2013-10-09 19:43:39 -07:00
Baligh Uddin 832e3ad7f8 am 61add623: am eaa0cdf2: am 9de77131: am 984622ba: am eea571ff: am 59a4394b: (-s ours) am 4176db82: (-s ours) am 7abed7f7: (-s ours) am af54a286: (-s ours) am 2203df69: (-s ours) am 5f2f3356: am 7eb5ed78: (-s ours) am 895fca8f: am 7cb72808: am 785c5068: (-s ours) am
* commit '61add623b9b07111a396988e388913e311acd28e':
2013-10-09 19:43:32 -07:00
Baligh Uddin 105c80b8a1 am 36dbc1d0: am 922aed2c: am eaa99aff: am 74ee8193: am 9b99b10b: (-s ours) am b14fa44c: (-s ours) am ac8a1cba: (-s ours) am 8d04cb97: (-s ours) am 28feb5e3: (-s ours) am 2a55ea12: (-s ours) am ed3b0c1f: am 50190e4d: (-s ours) am 590fb058: am d611d681: am fd2b08c7: (-s
* commit '36dbc1d0a46b0eb9d0777d5f941fab0d16c4af61':
2013-10-09 19:43:29 -07:00
Baligh Uddin 8272b30a00 am eb599f99: am edc69f39: am 8406b85c: am 05f1e175: (-s ours) am decb3452: (-s ours) am cacad34a: (-s ours) am b823a9c8: (-s ours) am 1a652579: (-s ours) am e525e665: (-s ours) am 97a1a262: (-s ours) am 16fd5b56: am 8f661c08: (-s ours) am c3ef0606: am 38638453: Merge
* commit 'eb599f995113c02196279fd141906189663abef4':
2013-10-09 19:43:25 -07:00
Jean Chalard bad68bbf6d am def9fd8a: am 3a31b803: am 39d41657: am 58a5361e: am b46b95ac: am 61b42c01: am 7ad3b9d4: am 10166a6f: am 96cb194b: am 7b9ff7ea: am 65d25343: am 671c5017: am 892f1b46: am 63e442cf: am 5fca38c5: Merge "Small performance improvement / minor bugfix"
* commit 'def9fd8aa344fd3db88e78d53a82e118554c0087':
2013-10-09 19:43:22 -07:00
Ken Wakasa da916ba004 am 97d4b604: am c7790bc7: am 8a1a0c29: am 888fd911: am faf445b4: am 5e80313c: am 877356b9: am 53d1b5c3: am ee411bfd: am 1cc70860: am 0814f719: am 3d4909e0: am 441fbbaf: am 9a0e877c: am e3aa7f10: Adjust CHAR_LIMITs
* commit '97d4b604203cb53e6e4af288e1d3b0dfb13c7c70':
2013-10-09 19:43:19 -07:00
Jean Chalard 82d2304c00 am 22b9af13: am a1c876b4: am dc74630a: am 24c21c50: am c0fc283d: am d4d12046: am f5e8895e: am 0e354eab: am fe8e9e28: am 075adbf9: am b9d1015e: am 6921700d: am 203af810: am 8e643e32: am b76ce125: Merge "Remove a useless function"
* commit '22b9af136197bae110a5edb6666fe4f0526a0758':
2013-10-09 19:43:16 -07:00
Jean Chalard da8968aced am 9887f1ab: am 67a09c76: am 2646422e: am ad12a9b6: am ecebd5b5: am 65fcac85: am 0ce281dd: am dac7130e: am bc7d20bd: am 6e8b707f: am 6180447a: am 4b457e5d: am 0376d9a0: am 647f629a: am a5a2f3e3: Remove gesture suggestions with an INT_MIN score
* commit '9887f1ab442ae4644a8a5f39a41f98f541097e4d':
2013-10-09 19:43:13 -07:00
Jean Chalard abb2c27a45 am 00d3f791: am 65dc90ca: am e5a4e595: am 28613aa8: am 5cf88c94: am e026e8e7: am c4728f5c: am f1dc8e8f: am ab2540b0: am 5d229449: am 16e6a5bd: am 4f046b59: am 5e5bd3b6: am dea5e6a3: am 03395833: Merge "Have Latin IME re-capitalize a selected string"
* commit '00d3f7915641e6b7ef9b40f33490342453529ef3':
2013-10-09 19:43:10 -07:00
Jean Chalard 086610077b am f4910fcb: am ca330f0a: am 10a408c7: am 6a330b66: am d8c2a56f: am bdb056cd: am 5292e68e: am 6c409959: am b9960881: am e0050a22: am 22a679a2: am 46b762c4: am d69892fc: am 12bf5a05: am e99daea0: Update dictionaries
* commit 'f4910fcb7d49384ccbb8c044786451dce069550d':
2013-10-09 19:43:08 -07:00
Jean Chalard 3cf0af09bd am f6e77b29: am 28047421: am d2bae545: am d9d2c172: am 42cad904: am a8160b83: am 6fd7f1c2: am e841ed70: am de3641b8: am f1055515: am 203d3bd6: am 2bf09135: am 2532265d: am 34676d92: am a022c538: Merge "If there are no suggestion span, recompute suggestions."
* commit 'f6e77b296af4ab6d972d7dd4663e5a08732a6b85':
2013-10-09 19:43:05 -07:00
Satoshi Kataoka 1df85fea10 am 2e1d2962: am e3f3d5b3: am eb4f8102: am 8f0dd6a6: am c24129e9: am 5a65eec7: am 4a766af5: am d2554f7a: am cff82b5b: am 31351d80: am 7eae5718: am 4f4a7fe8: am da9c04cd: am d55ccbf7: am 837f46dc: Enable touch coordinate correction for new algorithm
* commit '2e1d2962673b492371f01e38573b58f601bfd463':
2013-10-09 19:43:02 -07:00
Jean Chalard 06e2e9165a am 88c9b00c: am ec3b2bf9: am 8119e920: am 5a86e0cc: am e8d2114a: am e25c71a8: am 4d2e96e9: am d2e8efd2: am 816f2449: am b08397dc: am fa878fd5: am afbeba59: am ae731331: am be0e013b: am 059e084e: Merge "Reject a previously user-refused suggestion."
* commit '88c9b00cd7fbbe3037c9c1cbbf83ea81ba1eff8a':
2013-10-09 19:42:58 -07:00
Tadashi G. Takaoka 972a332312 am 3a17c4d4: am 6f6ceacf: am e27e0d70: am 9ab61646: am 0a12d887: am ed2c19d1: am 1da82714: am 2c159dfe: am ff1cf587: am 3dd3287f: am 67356b76: am bf22c2fa: am 577dc189: am 1a42236a: am 4b6756db: Merge "Remove unnecessary harmful finish() from SettingsActivity"
* commit '3a17c4d45e545cd397aadf7c8af4e1a532b377ff':
2013-10-09 19:42:55 -07:00
Jean Chalard 2d79a6a315 am d62abdc8: am 5439ef32: am b962b352: am 87d1cfef: am 8073a68a: am 39b72ee0: am 3ec1e9c6: am 7217e1c4: am 372354a9: am bcbbf8bd: am 4cae47f2: am 85315351: am 18c362d7: am 5f6492c5: am 673ebb4e: Merge "Update dictionaries"
* commit 'd62abdc817829309ffe3130c0a215f794b3fa71a':
2013-10-09 19:42:52 -07:00
Tadashi G. Takaoka 3f6932b56a am e44c5f8f: am 8d02ed09: am ae1fb800: am 27c14af5: am 06296c65: am 0c5eeb75: am e50c246e: am eb58bdb5: am 6e617f91: am 1f3764ed: am 85a3525f: am 511f0149: am 9797dd2e: am 2fd4a00b: am 1ec4c07a: Merge "Ignore modifier key while sliding key input"
* commit 'e44c5f8fa9092a8a987079d86bbd8b3ace89a3b5':
2013-10-09 19:42:50 -07:00
Tadashi G. Takaoka 17a782e01a am fa36de6e: am a2e6af45: am ef034c99: am 4b5619d2: am 9f3ef7bb: am e5a12463: am 8cf00f3c: am de25dae1: am e8b83088: am a48f5079: am 61c5c6b2: am 7067e8e3: am 333bb7db: am eabb710b: am f224941c: Merge "Suppress calling onPressKey and onReleaseKey while detecting gestu
* commit 'fa36de6ebcf68cfcbb78636740e703cf9c54b2b0':
2013-10-09 19:42:46 -07:00
Tadashi G. Takaoka 1ac92a86ee am d82533a9: am 6fe23391: am 1ac7957b: am 968af281: am 359c0475: am 57f7d3cc: am 18aea75a: am 7a67b401: am b9f335f8: am 9628d204: am d2cc5570: am 2b1e1c60: am ed497d24: am 089f1ce9: am bfb07ed7: Merge "Add preference dependency to gesture input related options"
* commit 'd82533a9ae8390aef3d092ef9d3dee8d55c2b0f3':
2013-10-09 19:42:43 -07:00
Jean Chalard d4d76d3608 am 90c40ab6: am 5d222593: am bdbd3dea: am 2b08fd2c: am fb627ae0: am 687a3bfa: am 052750ee: am 57fe5281: am 8f49a814: am 1b116879: am 3a1396aa: am e1f7c7dd: am d244574b: am fd959fd1: am 1903b41f: Merge "Clean up tests and increase speed"
* commit '90c40ab6725f8956a2c6ab9a7a85e29d9133a015':
2013-10-09 19:42:40 -07:00
Tadashi G. Takaoka e8ab673c2d am e9404b7e: am 2fc37f85: am 89a155f3: am 1fec7d6a: am 340bb7ca: am bcaf86b0: am 137f6c56: am 4e9aa771: am b52166a4: am f630dcc0: am 9e67e3b8: am df848bcc: am b8540f8e: am 18414333: am e2af9b7e: Merge "Reset vertical correction when more suggestions are in modal mode"
* commit 'e9404b7e6b2fc970311180cbb82792d3573d3825':
2013-10-09 19:42:37 -07:00
Jean Chalard 6c7f8ee606 am 4b8c9ff4: am de9442e6: am e0301c75: am c3c1e552: am e8953fde: am 8cfb11b4: am 90e41da5: am eebfe359: am 9df8f3a1: am d0eee16e: am 77f92f70: am 3ea03315: am 9b7fefea: am 6223d823: am c2653d0b: Fix a typo
* commit '4b8c9ff47a8bddb2c627a7df9cc344fa404f9a7c':
2013-10-09 19:42:34 -07:00
Jean Chalard be13594a4d am 9a06cc3d: am a01eafb8: am d66e57c5: am 58b53dd3: am 2c312038: am 0d9aad3d: am e0f0ed22: am 1ed7d94f: am f0e59729: am 5717f5b4: am 0af32078: am 2dc1f0bf: am ba5e450e: am 69ffa8b0: am 03d1dff3: Merge "Fix Binary dict tests"
* commit '9a06cc3d79c05e3437928883f49e6f64122fbd61':
2013-10-09 19:42:31 -07:00
Satoshi Kataoka 02b8b174c1 am ae8fce05: am a94ac381: am 03eb22ed: am 36341d7d: am 18d5cd27: am 524ff4b2: am 4f80a117: am 224a1db9: am 3fb9c290: am f3cdb27d: am 7cb491a8: am 87a3830a: am e157fa50: am 6246b7c3: am a94bb198: fix assertion
* commit 'ae8fce05012d0fa73a96f7da0f97eccf08a5f7e5':
2013-10-09 19:42:29 -07:00
Tadashi G. Takaoka b95a4665e3 am d1955f75: am 843706cc: am 6a5339c0: am 6815f105: am 674630f9: am 73b66655: am 8a703835: am 93e96ad3: am 137591e0: am a7e6a2b0: am 2a279011: am 8af80b3f: am b0d3d86c: am be1232b3: am b12c2af3: Tighten unit test condition of MoreKeysKeyboardBuilder
* commit 'd1955f7584e3f446d4b2fbb66312a3988cffa0f3':
2013-10-09 19:42:27 -07:00
Baligh Uddin bd71081a75 am a48d4b41: am 8c718189: am 78108f78: am c8351c24: am 038aac1c: am 8527cc56: (-s ours) am b541f4a9: (-s ours) am e22f8da1: (-s ours) am 39b1a7dc: (-s ours) am d0b80ed4: (-s ours) am 9fa8fbc8: am 670d8852: (-s ours) am 4793943e: am a270f90a: am dc64866c: (-s ours) am
* commit 'a48d4b419a6709684a7dc4ed415b624a07baa155':
2013-10-09 19:42:24 -07:00