Tadashi G. Takaoka
|
4963dbe19e
|
am 62ff3951: am 4f8592a9: am 3c64fa49: am 0453130f: am 902daa63: am 87b41356: am e46e4b23: am 834ac8d4: am 9f85d497: am d66e4c45: am 0bc46dca: am 4b7e0c5a: Merge "Remove wording "wizard" from setup application"
* commit '62ff3951887e32bb9df4d4a1ee8a40eee9c6777b':
|
2013-10-09 19:45:57 -07:00 |
Tadashi G. Takaoka
|
bd8e4705ce
|
am 3df59adc: am 2a86865a: am 63992be5: am 037f61bc: am 415d0903: am acc1d931: am f672fc91: am eb888a01: am ecc459af: am 85e8dca4: am dc079451: am 480284e2: Merge "Add edit personal dictionary settings menu"
* commit '3df59adc1ec3fda09916f36a9ca3814e3aa0a61c':
|
2013-10-09 19:45:54 -07:00 |
Jean Chalard
|
e8ede3d64e
|
am ca8ed426: am 6a959b19: am a9ab6da2: am 1c3815b2: am 8c930641: am 151c806e: am a3cbfe0d: am d2dc2d39: am 12ac4d55: am 5fe03e93: am 1aab945b: am c3f47836: Add an additional ID to the client info.
* commit 'ca8ed426d0a1dbfedeaf17914827cf34d30b5464':
|
2013-10-09 19:45:51 -07:00 |
Tom Ouyang
|
510d7c57cf
|
am 9501578b: am f3aa1d8c: am bdb3a393: am af3679f1: am 7422c43a: am e0b57919: am 18dfb405: am 7abde243: am 21e6e12b: am 5d8638e4: am 56fab87b: am 14aa8f1d: Fix autocompletion lookahead handling
* commit '9501578bbbdb6e0d8928f019f16b8a3f7827390b':
|
2013-10-09 19:45:48 -07:00 |
Baligh Uddin
|
ee734fd5c9
|
am cfdfe697: am 724c7795: (-s ours) am 221e6372: (-s ours) am 0b837599: (-s ours) am fdcbbf40: (-s ours) am 730ce6a2: (-s ours) am 9370457e: (-s ours) am 337e45a5: (-s ours) am 90ff1c45: (-s ours) am 7e383483: (-s ours) am 6ef7a95c: am f595a062: (-s ours) Import trans
* commit 'cfdfe6976edb725bb1181a98f0d844fcc79973b1':
|
2013-10-09 19:45:46 -07:00 |
Baligh Uddin
|
98ec7c652f
|
am 9eeab0d1: am eed3ca99: (-s ours) am b0351093: (-s ours) am a4ddff8d: (-s ours) am 0bd5082a: (-s ours) am 072f1fd7: (-s ours) am a73bf9ab: (-s ours) am 23470172: (-s ours) am 4674c44f: (-s ours) am a25cab6f: (-s ours) am 3b4a2b31: (-s ours) Import translations. DO N
* commit '9eeab0d107d1aaec48be5182f2dd4cabb886a9fb':
|
2013-10-09 19:45:43 -07:00 |
Satoshi Kataoka
|
9fe75404c0
|
am e0ecfc72: am 5e48601d: am 3e8a7cc4: am 1230c824: am 79642e0e: am d6be3fd4: am 10f50009: am bffa1894: am 4937d4c6: am 874c4fda: am 434abe45: am 9b4e3db1: Legal notice
* commit 'e0ecfc72458ea5ccb23433ff5adc75d5300886ef':
|
2013-10-09 19:45:40 -07:00 |
Tadashi G. Takaoka
|
8fe077a4d1
|
am 8d1fb069: am ec088491: am 60ed054a: am 31df9aa7: am 8c0dbd04: am f8202b3a: am ed686652: am 4722a400: am 9b27761c: am 16bacd59: am 34b00870: am 1a9bf159: Merge "Don\'t triger onPress and startLongPressTimer when gesture is canceled"
* commit '8d1fb06997b2d071cbd2cd401d236092f7afda4f':
|
2013-10-09 19:45:37 -07:00 |
Tadashi G. Takaoka
|
3db656f16d
|
am 2c9d13dd: am c0a388d3: am 05de05e8: am de566bed: am a5d7235f: am e8743aeb: am 04d573ee: am ea0a2d3d: am fec589f4: am 7a584880: am 80a98ee5: am 508ab248: Merge "Implement IMM.switchToNextInputMethod() for ICS"
* commit '2c9d13dde7c181f394ae304372a865c105a0d6c8':
|
2013-10-09 19:45:35 -07:00 |
Jean Chalard
|
88136e2996
|
am ee58871a: am 9c0f481c: am 41f023d3: am 92e13e5b: am b634b92c: am cf34ec74: am 0b0ed3c9: am 94ca19ee: am 9a6050df: am d8217ff0: am 19c46d32: am c9688ef2: Fix a small bug
* commit 'ee58871ad7dde20a15e28e75fe892ccd1a581b98':
|
2013-10-09 19:45:32 -07:00 |
Jean Chalard
|
782067fad5
|
am 340b1bed: am a7cdcdfe: am 08c97a98: am ce47c639: am 0813b1d3: am b0278f3f: am 5c9fbe19: am 4685e53f: am 06c75423: am cd7f6963: am 72e8d942: am 6d25be9a: Merge "Don\'t kill suggestions with native score < 1"
* commit '340b1bed7a73babd902ed8cd39162893d5e672cd':
|
2013-10-09 19:45:29 -07:00 |
Tadashi G. Takaoka
|
65a4b31ab9
|
am e46eea2a: am 03fc4c69: am 85d065f0: am 192e4f44: am 4f98bffb: am b0b15736: am a90ae9bc: am 2d3d4250: am b5bb317d: am 962c245c: am 6bbe6858: am 0f07935e: Centering setup wizard welcome video
* commit 'e46eea2afedddcb797e3ab86bf59a5da742ababe':
|
2013-10-09 19:45:26 -07:00 |
Ken Wakasa
|
e79936080c
|
am 2964538d: am 69478b05: am 7de58797: am cdbfd0d4: am 5ab0d2f7: am 43b65cd1: am 29a53c5f: am b022f3c9: am adccd218: am 77d7f8a0: am 72797500: am 2a9b5447: am a56c7020: am d4ab58a0: Add translatable="false" for appropriate entries
* commit '2964538d813109bb5b8659ee2ca65a59877a04f5':
|
2013-10-09 19:45:22 -07:00 |
Kurt Partridge
|
d5cc6dbc37
|
am 902b8466: am e2f90feb: am a708f060: am 53560879: am 55d86194: am 47415587: am 28f1b992: am 3b0a6bf3: am 1a017fc7: am 6f3b9ddd: am bd99e8dc: am 41b34cf2: Merge "Allow LogUnits to hold >1 word"
* commit '902b84668309533b987998a955d50877712ed292':
|
2013-10-09 19:45:19 -07:00 |
Jean Chalard
|
eeaa37acf3
|
am fe6b380f: am fe5880b6: am c5db596a: am 331dcd09: am 340b0b4c: am 789bf1eb: am 2f26a0d8: am 1a56ff13: am a3116056: am 643bdb0f: am 6f6974e6: am 825da76c: Redisplay a hidden button after it entered the screen again.
* commit 'fe6b380f0af7d7aa8da4f59ba80c5fb821ed5094':
|
2013-10-09 19:45:16 -07:00 |
Jean Chalard
|
59eca1dcd6
|
am 86e0f1ba: am 8cb65844: am c46d0e3b: am 6d937632: am bb09e98e: am 71c4a980: am a0735e5a: am f24739a1: am b54d1bad: am 12e180a6: am 6dc9933d: am f8014eea: Hide the correct button when pressing a new button.
* commit '86e0f1ba5d48468dd7f9983b7e731631ca77398c':
|
2013-10-09 19:45:14 -07:00 |
Tadashi G. Takaoka
|
6dda579fea
|
am ea791bc9: am 5f0858ef: am 28306ce8: am e90368cd: am f01f5112: am 6e3ce30f: am 27e6a433: am d7316d30: am 2d9847ac: am 56c6c336: am ab11dbe8: am b8ff89c8: Remove translatable="false" from setup wizard strings
* commit 'ea791bc9a377a33839a6831554548e2cf49e0388':
|
2013-10-09 19:45:12 -07:00 |
Tadashi G. Takaoka
|
7e21ee1eda
|
am b100813e: am 8a6193d8: am 6aad2734: am ca095c0d: am 239c161e: am c8791acb: am 18453ab1: am 072b7022: am 7f895a85: am 67f3a102: am c35e0e6a: am 42afa82d: Support landscape orientation for setup wizard
* commit 'b100813edfbd9bef8dcae8992e9d39cd0f1f387e':
|
2013-10-09 19:45:09 -07:00 |
Tadashi G. Takaoka
|
2211e742e2
|
am 46b1f11d: am c5c3d47f: am 5de837a3: am 67a3d16a: am 9717ec96: am f2dd3ed1: am a1bc667a: am 5475b828: am eae3172a: am e8469732: am b3663df5: am 68e4de1e: Add welcome screen to setup wizard
* commit '46b1f11d9b96dec1fcde76e53e3df792ea88a52c':
|
2013-10-09 19:45:06 -07:00 |
Tadashi G. Takaoka
|
75aa3b1d6d
|
am 59524e4b: am 80888cf9: am 08d13623: am 284ef541: am f6ff0a09: am 4aed99fd: am 0deeb4ce: am 23c5a47e: am cd1e44b6: am b2f8f66f: am baa1e14d: am fcefabf9: Groundwork to implement landscape and welcome screen
* commit '59524e4baf92185a2ac0f5381fc6290454f47f16':
|
2013-10-09 19:45:03 -07:00 |
Tadashi G. Takaoka
|
14abd7f302
|
am 651dd0a5: am ba8ac2ed: am 6bcf315f: am f32f75c7: am bc19d290: am 4b546c61: am 8e519cf3: am 854227ac: am a3768015: am 680fa7ba: am 82a7b185: am 16ec2e11: Merge "Add finish action to setup wizard"
* commit '651dd0a53928e8f6f4b0483a93e3b86fa8d32048':
|
2013-10-09 19:44:59 -07:00 |
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 |