Commit Graph

21877 Commits (bd65e6107f37f9b462d8a24dca4699f2c2252e1f)

Author SHA1 Message Date
Jean Chalard 22b9af1361 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 'a1c876b427bf3ffd81d3da4d2f023688ca5d9e01':
2013-10-09 18:05:08 -07:00
Jean Chalard 9887f1ab44 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 '67a09c76d9c1b5fc684867d34c57f316757ab420':
2013-10-09 18:05:05 -07:00
Jean Chalard 00d3f79156 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 '65dc90ca2270eea72f1da8efad6795f00cf7ee1e':
2013-10-09 18:05:00 -07:00
Jean Chalard f4910fcb7d 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 'ca330f0a756c9c80b010ac6df0d4934f96e0a6e0':
2013-10-09 18:04:58 -07:00
Jean Chalard f6e77b296a 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 '28047421eb353601e4a6512fa0f93dfcc6c40fff':
2013-10-09 18:04:55 -07:00
Satoshi Kataoka 2e1d296267 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 'e3f3d5b3128710fff533f737bd89bf8a67ea0d79':
2013-10-09 18:04:52 -07:00
Jean Chalard 88c9b00cd7 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 'ec3b2bf9e7aa3a52f63b10a1e43b742780e5a679':
2013-10-09 18:04:47 -07:00
Tadashi G. Takaoka 3a17c4d45e 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 '6f6ceacf446ac93e2e7a1b3707b5ab033d11b502':
2013-10-09 18:04:45 -07:00
Jean Chalard d62abdc817 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 '5439ef325b3f326e4905673bc20a3ff9a1118823':
2013-10-09 18:04:42 -07:00
Tadashi G. Takaoka e44c5f8fa9 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 '8d02ed09be374c125543d33a0eb97ebb907f21ba':
2013-10-09 18:04:39 -07:00
Tadashi G. Takaoka fa36de6ebc 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 gesture"
* commit 'a2e6af452ab24cb1bfa127301256b8eaccda05dd':
2013-10-09 18:04:36 -07:00
Tadashi G. Takaoka d82533a9ae 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 '6fe2339116535971e313fcfb6fd0d6169a4f55ad':
2013-10-09 18:04:33 -07:00
Jean Chalard 90c40ab672 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 '5d222593c3994b3e046682735b8dc6aa83b11ac8':
2013-10-09 18:04:29 -07:00
Tadashi G. Takaoka e9404b7e6b 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 '2fc37f850cf8b59f0594ef7e77a1a5351be143a5':
2013-10-09 18:04:26 -07:00
Jean Chalard 4b8c9ff47a 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 'de9442e6b08e27c05071a9c58800bcb132a8d17c':
2013-10-09 18:04:23 -07:00
Jean Chalard 9a06cc3d79 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 'a01eafb8839b3cfbab8a766246d492f03843eaa3':
2013-10-09 18:04:20 -07:00
Satoshi Kataoka ae8fce0501 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 'a94ac3817ec47e9343da8c03020d2ecdc0ea387f':
2013-10-09 18:04:17 -07:00
Tadashi G. Takaoka d1955f7584 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 '843706cc0bdb9954e7ddfc8a66e7af16d1a3cd25':
2013-10-09 18:04:14 -07:00
Baligh Uddin a48d4b419a 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 0dbc8c35: am
* commit '8c718189abd6155104d5b2584cc0ba17b4a146cb':
2013-10-09 18:04:11 -07:00
Baligh Uddin 2bfc4e382a am cb92fc2a: am 6fae85d2: am b5a35b6f: am ea696e85: (-s ours) am 3107d241: (-s ours) am b3cb14f7: (-s ours) am 2bac6309: (-s ours) am 96abd37b: (-s ours) am 15047a85: (-s ours) am ce4d1cd5: am c2e36a8f: (-s ours) am 97aa9c40: am a5506b53: am bfedad23: (-s ours) Merge
* commit 'cb92fc2a98126c150f4ced9d6ec5b804bfdb64ec':
2013-10-09 18:04:09 -07:00
Baligh Uddin cfb420f70f am 392c2860: am 0010e81c: am 055d0ae7: (-s ours) am c1658257: (-s ours) am b6beb973: (-s ours) am 9f016b5d: (-s ours) am 5b34a371: (-s ours) am f166bdaf: (-s ours) am af0d283b: (-s ours) am 4e12347e: am 931e2530: (-s ours) am 37ac3b3a: am a559e767: (-s ours) Merge "Im
* commit '392c2860db737d62040a189aade1bf1523866f12':
2013-10-09 18:04:06 -07:00
Tom Ouyang 63e0d6925f am 4fb29c25: am dc78da6c: am 1dae8195: am 8ca4d50f: am 69892512: am 09688051: am 829b4db7: am 6e361e44: am bc62c67b: am 0638a632: am 3386a6d7: Merge "Remove duplicate new-word bigram cost (part 1)"
* commit '4fb29c25fcd017c3409eea39b7f87ef3468fcf7c':
2013-10-09 18:04:03 -07:00
Kurt Partridge 196d933b70 am 0981b577: am 8b38866c: am 5696cc3d: am a8f05288: am 5130ebb9: am 7281fb14: am 5c2eb205: am e7386e15: am f61ff3af: am 13b32ee1: am 368427e2: am de51abf1: am bfe5c07f: am ededdc6a: Merge "Avoid NPE"
* commit '0981b577f27caa7a9228e652ef7fc14eacf03fcf':
2013-10-09 18:04:00 -07:00
Jean Chalard 690fe5fa78 am 195e77a5: am 5c9b731e: am c7cb5124: am ec9b2ea3: am 1771df34: am b86d0a25: am 96f8f9c2: am 548ff78b: am 6d908ce9: am e4e1964f: am d902228e: am f080123d: am 8895e5fb: am 128961ad: Fix failing tests
* commit '195e77a58a128f2e230c8f97d294286c9340981e':
2013-10-09 18:03:57 -07:00
Jean Chalard 96bef21483 am 2092247a: am 5c26685c: am a3824a7c: am af9c9351: am 2f26d174: am 94c91022: am 8b715de6: am c2b51cf8: am c1aec8ee: am fd4c38c8: am 5e225afa: am 38011d29: am 41e59b62: am 2cd1136b: Merge "Remove the dialog to insert words to the dictionary."
* commit '2092247a7742e292c2ac9aa0a5dc1b933a66904a':
2013-10-09 18:03:55 -07:00
Jean Chalard 8cbfe51259 am def1591f: am 464148a8: am 3af4a660: am e232ec46: am 1f75c94c: am 46aa843c: am 09f4b598: am 3076b0cd: am 433396e1: am 4d45fbe0: am 5e783427: am 7b81296f: am cb633e37: am 91bcf5eb: Merge "Restart suggestions when the cursor moves."
* commit 'def1591f1df336f413b7d69f9059fbdf804a1c36':
2013-10-09 18:03:52 -07:00
Jean Chalard 26bfdbf213 am 9e124819: am bffc6e39: am d71a0330: am d1e46b86: am 883ed059: am 620e2724: am 5c91fb7f: am 00e2c9d2: am 3caf964d: am 6aefd57a: am b8b0ca34: am fda69c44: am 991b1ef8: am 02ce3dc2: Fix a bug with bad application completions
* commit '9e124819768e5834e89d7d4b7741d5fa62458401':
2013-10-09 18:03:49 -07:00
Jean Chalard 74be229433 am 68d7a4a5: am ad34a7d4: am 57e35664: am 70cdbd55: am 9acfef11: am b3a47867: am fa75f500: am d78a7952: am abaccadc: am 5184bfe4: am 012dc7f5: am 5351510d: am 68b392cc: am d24f9397: Merge "Make shortcut-only user dict entry non-words."
* commit '68d7a4a51f6a91c69de986c78a2cbbe7f2ab52f6':
2013-10-09 18:03:46 -07:00
Jean Chalard a02b1f4010 am 91fa3b5f: am 5722360b: am 0df32cdd: am fc6e3658: am c70156b4: am 6451d473: am 8aab2696: am aadc3209: am 097ec0c0: am 29aa47b1: am ed580a43: am 91290810: am 907a95c2: am fb5869e9: Merge "Add a class to encapsulate getting the metadata URI"
* commit '91fa3b5f44be140e6a390ab662cc7ec88c9a3286':
2013-10-09 18:03:43 -07:00
Jean Chalard ccb2d269e5 am 436834bf: am 1f5bce49: am f75f8c19: am 6aa41c22: am f4d115f5: am 9c672b53: am 4552b014: am 0d4ade91: am 112db204: am b0c84b8e: am 03c4f795: am fb49fb9e: am 0ea30200: am 676c97eb: Merge "Remove voodoo magic."
* commit '436834bff768466f46ada7a50b7c8e4b9d0e0356':
2013-10-09 18:03:37 -07:00
Ken Wakasa 543f108c85 am 8d681818: am f31eb50b: am 1bc04400: am 0c88a606: am 6bc0b184: am 482e6f48: am 04c8a642: am 82b8d414: am 9f272ae6: am 2a3fb325: am eeb23c88: am b78f35de: am 78e61041: am 2daea197: am 47bb8d7d: am 4fffa27d: Fix a native crash in AOSP LatinIME
* commit '8d681818ddf6aa4fa7c5f0f2892359d8f5b6b9ca':
2013-10-09 18:03:35 -07:00
Jean Chalard be4ed1e944 am 5b8dd46c: am bc58383e: am 1625e9b1: am 8036c54d: am ec0bf1ac: am febee11e: am 1dd9aeac: am 14ed8d7a: am f32684ea: am df4e24fe: am 24965bb7: am 5875362b: am 9613be01: am d0623ad7: Merge "Move some values to a place where they are easier to override"
* commit '5b8dd46c8b3cc28718ac9cc5215bfa125eee364f':
2013-10-09 18:03:32 -07:00
Kurt Partridge d8a9a4d4e6 am 9213fc4e: am af90ade5: am 7b48fdb1: am a70982ba: am da26964c: am f17b22f3: am ac1d2d7a: am dcad4ed8: am 1015c58b: am 8d58b400: am e8deca68: am a5613e63: am bdce031e: am 2927223e: Merge "Better isolate ResearchLogging data"
* commit '9213fc4e80d475b04fd2c17198853ec22f2508c1':
2013-10-09 18:03:29 -07:00
Tadashi G. Takaoka 4a332672bf am aef4e10c: am e819020b: am 6130bee1: am e0a93a10: am 5e7a962e: am 4f1efa48: am 51f8be38: am 9bae4911: am f3161c20: am 5f68231b: am 2fb79605: am dfc81359: am 3d6b7431: am cd692be1: Merge "Change the default vibration duration to 20msec"
* commit 'aef4e10ce0d0f0b2e83d5310a3996375111bca24':
2013-10-09 18:03:26 -07:00
Jean Chalard 032fc922dc am 48cbf9a5: am 7b2a0cd7: am 5a5fe6dc: am 54bb68cc: am 55af45de: am aa8ed024: am 37e3d1a8: am fe6708a7: am c80e1227: am d25155ce: am c2b8f469: am 27dede24: am 2e4352c5: am b5d5190d: Merge "Add some utility functions."
* commit '48cbf9a5fc75a21751bc782502869a3f49aa38dd':
2013-10-09 18:03:24 -07:00
Tadashi G. Takaoka c218140b15 am 3b0c8112: am dbe8d047: am 0f57a049: am de550e1d: am c5a380a2: am 1c18e924: am f4b048ed: am b90bb7ab: am 5b80c6c7: am bef0bb7c: am 253b54df: am 3be1c748: am 05314bf0: am 4f5f81d5: Reorder advanced settings menu
* commit '3b0c8112dc9135415d815f552e8324dc5cf37f88':
2013-10-09 18:03:21 -07:00
Tadashi G. Takaoka af1b0102e3 am cf9412bd: am 1dd93386: am 45e7fd91: am 096e5ffe: am e84ad7a1: am 850b01de: am c31e9f8c: am 60f20444: am 8ce77079: am ff231781: am eba96f3e: am 46762bf5: am 206ce637: am bd8e92d8: Add debug message to detect unusual zero width condition
* commit 'cf9412bd1713dd9de0645b570bada219258a075e':
2013-10-09 18:03:18 -07:00
Tadashi G. Takaoka 4d8d51f309 am ed8f9984: am dd980599: am dfa21296: am 4278a089: am 4ddebdaf: am ecbd003a: am f2604bde: am c9b8d7a8: am a8425224: am 2c2dd9e7: am 5cbe78dd: am 1ba1c411: am 93fe83a1: am f67a3881: Merge "Add TypefaceUtils"
* commit 'ed8f998456419c9d87a9828b87774cb1f6b5acd4':
2013-10-09 18:03:14 -07:00
Satoshi Kataoka 0b761c501f am 649a971e: am 0c2f096b: am c26225eb: am e7a43a38: am 94bc0eca: am 0b8bf274: am a3742e66: am 44d2f4a2: am a4c26b8a: am da4f353d: am 74f7fb1d: am d0594519: am 4945b656: am 6c7d008e: Merge "add a debug flag to evaluate the most probable string"
* commit '649a971e609898ba9942a836e94e01d9778c6b53':
2013-10-09 18:03:12 -07:00
Tadashi G. Takaoka 252a1f0a2e am 78abd520: am e904c26b: am f693dd68: am f5010253: am 9d4e9773: am e98ba42b: am e8dd50ad: am 229c7a19: am 663809c9: am 83af8482: am 9b888ca4: am 24b39f16: am 18819688: am 6d0027a4: Merge "Use SparseIntArray instead of TreeMap<Integer, Integer>"
* commit '78abd5203c162431867687fc840ae97024523526':
2013-10-09 18:03:09 -07:00
Tadashi G. Takaoka 11395c7932 am 8ba918e0: am 3aec5a7a: am a66b076d: am d218cfc6: am a16c27be: am 45892476: am 9ca372e6: am e2834d8f: am 8aefc778: am 5c6fcf61: am 1c3bc4af: am dabcd969: am 1dc7fd3f: am cee512b6: Merge "More precise geometry checking for more keys keyboard"
* commit '8ba918e097fc8bdd7528f041a952eec40117c9a4':
2013-10-09 18:03:06 -07:00
Jean Chalard 502a31127f am 6305684c: am 2cf7c6f7: am f729cd38: am 390b0c8d: am 7770839d: am d1f279e0: am 253e5eeb: am bc6f49ba: am 09ddc933: am 852e031c: am 6743a354: am e910a9c9: am b7917ee3: am 3722f087: Merge "Fix two bugs in dicttool"
* commit '6305684c3b892af13ce0a5771e3145bee56accf9':
2013-10-09 18:03:03 -07:00
Baligh Uddin 979e1b9315 am be602bfe: am cc53e47c: am cdfbcf45: am f9641f21: am e765b721: (-s ours) 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
* commit 'be602bfed5403a9ae37d2c3ea4cfdfa0fbd256d9':
2013-10-09 18:03:01 -07:00
Tadashi G. Takaoka 9288e22911 am a14daaf6: am 582b25e1: am 058dc32a: am d396be7d: am d43365d0: 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 'a14daaf698a269b854dc9bf3aea290012451ca8c':
2013-10-09 18:02:57 -07:00
Jean Chalard 319490516b am ce233238: am b38f80f3: am e5b245dc: am 1a9c7aa7: am 259dd5f2: 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 d
* commit 'ce2332385b54fd502941c6a53f05e9ab74b0f42a':
2013-10-09 18:02:54 -07:00
Satoshi Kataoka abade73f89 am 5af8897f: am 1319880a: am 3dd261fb: am 91ce4fd6: am af11cd57: 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 '5af8897fccfdf589b46aac2a267f4e2bfd4ea6d1':
2013-10-09 18:02:52 -07:00
Jean Chalard 22d6d543fd am fd9503c8: am 6467a6c1: am 601106af: am df381f3b: am b7687c79: 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 'fd9503c8c8c8dabec53a6c4dfe87041d1272ab1c':
2013-10-09 18:02:50 -07:00
Kurt Partridge 408d0ad84a am 73729362: am 0d26fba5: am 2736c06e: am be1e5db5: am 19b75973: 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 '73729362a1eddf34c1cac0606068de6c70870ee1':
2013-10-09 18:02:48 -07:00
Kurt Partridge 9ecf47fe52 am fb473b5e: am b87e83da: am faa84ff6: am 07155e26: am d2a6c5b6: 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 handli
* commit 'fb473b5ec8028dd750ab4b26bb8e3f303ebfe285':
2013-10-09 18:02:46 -07:00
The Android Open Source Project 750c185362 am f0bfd790: am 48794624: am f954815e: am e68a743e: am b87f91ea: 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 a8d2908
* commit 'f0bfd790d1301e4c241ad4b93342ef431a772461':
2013-10-09 18:02:42 -07:00