Commit Graph

21880 Commits (82d2304c005ce330cd12efe10e10d0a571d42fdd)

Author SHA1 Message Date
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
Ken Wakasa c5134f19b5 am 3d2bddf3: am 4e1a3e01: am e37b2f9c: am 33bccd46: am c18d6bc4: 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 '3d2bddf31c2baed3e1c6441aa8908084e60941fa':
2013-10-09 18:02:39 -07:00
Ken Wakasa d2183af41a am 14576680: am 801ebf4d: am 2a5a3aae: am c1deb049: am c80a55b8: 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 '1457668034115fef143031be45bd0a27aed877b3':
2013-10-09 18:02:36 -07:00
Ken Wakasa 86108c3e3f am 8e3342a2: am c41da840: am 607b6eb3: am b32dad1b: am a66cdddb: 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 '8e3342a241f4e5179304fc449869eb39d87366a1':
2013-10-09 18:02:33 -07:00
Satoshi Kataoka 964dc8f751 am 50374c82: am 82467616: am 60745ed5: am 08bba22f: am d2b67775: 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 '50374c827131e6c49b9588864fb45ba503da3869':
2013-10-09 18:02:30 -07:00
Satoshi Kataoka f7371b7d0e am 7e65243f: am 06c91c6f: am bc763433: am e10ec002: am 41da7f73: 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 '7e65243f511d9ba243c763cbaafdabcf2a2ea3d5':
2013-10-09 18:02:27 -07:00
Ken Wakasa af5a889400 am cdbbddb4: am 635b1582: am 3608f732: am ba76215e: am 172749c5: 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 Advance
* commit 'cdbbddb4bc24368449843134857e95876b0914f1':
2013-10-09 18:02:25 -07:00
Jean Chalard 389d6ec1b2 am c6de472e: am b28ffdd3: am f354cc34: am 6fc428b1: am 0ffe68d8: 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 StringU
* commit 'c6de472e292891a4cc059519f100ecaad0365a93':
2013-10-09 18:02:21 -07:00
Tom Ouyang f0288e9f25 am a3ceca75: am 5d7e9e9a: am 3243a829: am 0481044e: am c968c5e3: 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 'a3ceca758f44af56d1cf4da2baa1f24fcd2aafd5':
2013-10-09 18:02:19 -07:00
Ben Cheng cd07bf945b am 76d69023: am 507e1476: am a2ef8982: am bfeb8aac: am aa7d86c0: 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
* commit '76d69023a43e458dcce90a56f8708ea6a8cb5891':
2013-10-09 18:02:16 -07:00
Satoshi Kataoka 7d850086fe am 851fcb7d: am e5d5685d: am f1e40023: am 306dde7b: am 0539b6cc: 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 implemen
* commit '851fcb7d7187ba3a2a1a7aa2c05b2c4e234d6113':
2013-10-09 18:02:12 -07:00
Baligh Uddin 837f62e45c am 2ed34fb7: am bba31722: am bd9d2c80: am 119a6ad0: am 885ff1b0: 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 re
* commit '2ed34fb7d49e332aafdbb968c130152112b821fb':
2013-10-09 18:02:10 -07:00
Baligh Uddin 55d109b563 am 10e6bc0b: am f2740bac: am 69271b03: am 77fd6b8f: am e2bbc66d: 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 c48fe5d
* commit '10e6bc0bd8749ee853d342351e942b95f2fbb024':
2013-10-09 18:02:08 -07:00
The Android Automerger 1078d836dd am 3e889a4b: am 7d43e52a: am e717588d: am f8e0b8a2: am 983b4866: 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-latini
* commit '3e889a4b26ad61814a18a5a97295d3df153f9eac':
2013-10-09 18:02:05 -07:00
Jean Chalard 57c620cbc0 am 72dc1256: am 06a0aa28: am 4a4fb3ad: am 9b3fce87: am 9c5305dc: 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 "C
* commit '72dc1256a8e1d478d6bbb986b1f71b3caa3c01af':
2013-10-09 18:02:02 -07:00
Jean Chalard 4f4186327f am 689bd40f: am 0a204ea9: am 465b7d7c: am 14d356d1: am d5e72d74: 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 "F
* commit '689bd40ff8353ee4df0dd8a38eea9c2c7de0933e':
2013-10-09 18:01:59 -07:00
Satoshi Kataoka 6f5de7d941 am 29baae0d: am 99a0fa2f: am 6796473b: am 668dc1eb: am 2ddb9422: 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 "M
* commit '29baae0d1fc642c5f0b23ae71e6a332586e37b24':
2013-10-09 18:01:56 -07:00
Jean Chalard b016aa77e1 am c866fd10: am a6738eed: am cdf0e0d9: am 2f3a1dc4: am 1e11b6fd: 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 e405ec7
* commit 'c866fd10e0582de99d3225cf7a3756cfcde8c9ff':
2013-10-09 18:01:52 -07:00
Jean Chalard f16a490493 am 469bf17d: am 01e53afc: am d69d9044: am a0a16b0c: am 5fa0e866: 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 e1f90dc
* commit '469bf17d139b311bc81e2440048339e43bff5918':
2013-10-09 18:01:50 -07:00
Kurt Partridge c3f79ad0b0 am 9d2f6e8a: am e3931b5e: am 34ee71e9: am 17398eb7: am 21d6a1eb: 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 "S
* commit '9d2f6e8a52d80d1681c8d4c3f9546d7a6d2b10c7':
2013-10-09 18:01:47 -07:00