Commit Graph

18420 Commits (a708f06019d9da398dc3b16d14a81a777d422e88)

Author SHA1 Message Date
Tadashi G. Takaoka 6130bee16a 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 'e0a93a1098cd00817da396d95ee9d5c0a5defbbb':
2013-10-03 14:20:04 -07:00
Jean Chalard 5a5fe6dc53 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 '54bb68cc9076bda3507b9a10b5c4a3a7a345aa53':
2013-10-03 14:20:00 -07:00
Tadashi G. Takaoka 0f57a04956 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 'de550e1d1749fb60a5c81b54aa3c002d4da2af97':
2013-10-03 14:19:56 -07:00
Tadashi G. Takaoka 45e7fd91f9 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 '096e5ffe161be6035290983de408d0334c79014a':
2013-10-03 14:19:53 -07:00
Tadashi G. Takaoka dfa2129690 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 '4278a089f31de7905852e33d5d15af67ad73f939':
2013-10-03 14:19:49 -07:00
Satoshi Kataoka c26225eb1f 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 'e7a43a3804cdeb3dc780d441b74c11489a84ebde':
2013-10-03 14:19:45 -07:00
Tadashi G. Takaoka f693dd6810 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 'f501025314be7c27d25644a0f61e14ca51c77c22':
2013-10-03 14:19:42 -07:00
Tadashi G. Takaoka a66b076da3 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 'd218cfc6a61ec92b70fc117df2f99eab1eb42d0c':
2013-10-03 14:19:39 -07:00
Jean Chalard f729cd38aa 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 '390b0c8dda5970da40fed67ac73e45b32da290a7':
2013-10-03 14:19:35 -07:00
Baligh Uddin cdfbcf454d 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 58df3cfa: Import translations. DO NOT M
* commit 'f9641f21ff4abee113e16c891dc0a4ad1f736547':
2013-10-03 14:19:32 -07:00
Tadashi G. Takaoka 058dc32a01 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 'd396be7d107a2279df5a4a10ca3a6c34dda5b0fc':
2013-10-03 14:16:13 -07:00
Jean Chalard e5b245dc50 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 dictionary."
* commit '1a9c7aa7cac1a32a401ec7cf157f04458402f54c':
2013-10-03 14:16:10 -07:00
Satoshi Kataoka 3dd261fb7b 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 '91ce4fd6fb4878bba17607e3007306ca6fc2dba3':
2013-10-03 14:16:07 -07:00
Jean Chalard 601106af1f 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 'df381f3b04a07ef4e92205092785fb9784658449':
2013-10-03 14:16:03 -07:00
Kurt Partridge 2736c06e13 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 'be1e5db580caa42ccd30a761b57d24ebc4b39886':
2013-10-03 14:16:00 -07:00
Kurt Partridge faa84ff62c 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 handling separator"
* commit '07155e261279c3d8c11c6430dff310c27545e53d':
2013-10-03 14:15:57 -07:00
The Android Open Source Project f954815eb4 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 a8d29082: (-s ours) am d5c8247f: Reconcile wit
* commit 'e68a743e3218d8a622bed77342af1d30ccb46055':
2013-10-03 14:15:53 -07:00
Ken Wakasa e37b2f9c12 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 '33bccd46574b861d4209f539e052bee0092cdeb6':
2013-10-03 14:15:50 -07:00
Ken Wakasa 2a5a3aaeba 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 'c1deb0499418215912c3fc7b168a0226f18aaea6':
2013-10-03 14:15:46 -07:00
Ken Wakasa 607b6eb3cf 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 'b32dad1b59d62120bfc7835cc9a0fc2d1e0dba5f':
2013-10-03 14:15:43 -07:00
Satoshi Kataoka 60745ed506 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 '08bba22f98c02f931c6e1d5e31b9c93915ad7fa3':
2013-10-03 14:15:39 -07:00
Satoshi Kataoka bc763433a8 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 'e10ec0020e2538ab151a37d05808d5e249e6a452':
2013-10-03 14:15:36 -07:00
Ken Wakasa 3608f7325a 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 Advanced settings
* commit 'ba76215e9e65d6d1309023308ba0c10e1d0c3b51':
2013-10-03 14:15:32 -07:00
Jean Chalard f354cc345c 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 StringUtils"
* commit '6fc428b15f3183eba186a6cddeafd44f198933a2':
2013-10-03 14:15:26 -07:00
Tom Ouyang 3243a82917 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 '0481044e2301bff39757881ba97e7f6b8b621a36':
2013-10-03 14:15:23 -07:00
Ben Cheng a2ef8982f2 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 Correction::isSingleQuote" into jb-mr2
* commit 'bfeb8aac1da170903e3b122d04cb7b8e1785deb9':
2013-10-03 14:15:19 -07:00
Satoshi Kataoka f1e4002305 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 implementation for typing"
* commit '306dde7bfdced70736679d7903f22a595cc25825':
2013-10-03 14:15:15 -07:00
Baligh Uddin bd9d2c8011 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 reset to jb-ub-latinimegoogle-azuki
* commit '119a6ad046f11108f967d61808b1f7fdf66dcd4a':
2013-10-03 14:15:12 -07:00
Baligh Uddin 69271b0387 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 c48fe5d1: (-s ours) am 51a47422: am a631cede:
* commit '77fd6b8f5dfdc8c9756efb04a2e4de22f26ea8b8':
2013-10-03 14:15:09 -07:00
The Android Automerger e717588d23 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-latinimegoogle-azuki history after reset to j
* commit 'f8e0b8a227360e693ad0539a3ad0a953e54149ec':
2013-10-03 14:15:05 -07:00
Jean Chalard 4a4fb3ad7f 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 "Change which backdoor the tests goes thr
* commit '9b3fce87ae9c33167c8e8bef4ebdc1e637279729':
2013-10-03 14:15:02 -07:00
Jean Chalard 465b7d7c35 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 "Fix a test."
* commit '14d356d1cc0ef05681795419992da3caf3b8f0d3':
2013-10-03 14:14:58 -07:00
Satoshi Kataoka 6796473b65 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 "Move typing policy to AOSP"
* commit '668dc1eb3b953bac5390a55fc52dffed1ab57953':
2013-10-03 14:14:54 -07:00
Jean Chalard cdf0e0d9d7 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 e405ec76: (-s ours) am 1bd8f332: am 6531bcdc:
* commit '2f3a1dc44eaec846bc4788fa536d00fa1170b7be':
2013-10-03 14:14:51 -07:00
Jean Chalard d69d9044e9 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 e1f90dce: (-s ours) am 6b29ef46: am 558f41d4:
* commit 'a0a16b0c0c97cb54e7edbd3b2a27eaa791d47361':
2013-10-03 14:14:47 -07:00
Kurt Partridge 34ee71e99c 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 "Split LogUnits differently."
* commit '17398eb7acf47d7507d52877856e3f00625263b3':
2013-10-03 14:14:43 -07:00
Baligh Uddin 9da4cf0ee2 am 1c294e9b: am 0995977c: 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 02fc1ed
* commit '1c294e9b54783c53f387c74e6266ef0f9e35cab6':
2013-10-03 14:14:40 -07:00
Baligh Uddin 1e80b3eb91 am 9b4ccd96: am 3455f2bc: 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)
* commit '9b4ccd96b72e8b064295fd941aea993bc8085412':
2013-10-03 14:14:37 -07:00
Kurt Partridge 1e0083a89b am 94e38883: am 06917b2f: 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 '94e388830e5d0c112b704efccdd26a09e6ff98db':
2013-10-03 14:14:33 -07:00
Jean Chalard 04658027bf am e547b53d: am 4b6c72a0: 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 k
* commit 'e547b53ddbb7e32d4ea4d87784240e85265b1b76':
2013-10-03 14:14:30 -07:00
Tadashi G. Takaoka 0dad6d9003 am 888f6ead: am 855aa95e: 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 '888f6eada2736408bf91a8cc5213c6e4db13abb5':
2013-10-03 14:14:27 -07:00
Satoshi Kataoka a1c8028542 am cc34a551: am f067287e: 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 'cc34a55165dce5eccef56ba6318c2f299f99999d':
2013-10-03 14:14:24 -07:00
Jean Chalard 9875b77612 am 9407a2c0: am f47c3325: 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
* commit '9407a2c06748ac839a881b56ff3c051190ca3cbc':
2013-10-03 14:14:20 -07:00
Jean Chalard d8f0eb0ddf am 842d3dc4: am 19bf4335: 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 '842d3dc40f4d6012bcb0438d68083fa4e62f98e8':
2013-10-03 14:14:16 -07:00
Satoshi Kataoka d326890b28 am d42c151e: am 110d360c: 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 'd42c151e8cb463e4b56be58598cd7e5def5daf36':
2013-10-03 14:14:13 -07:00
The Android Open Source Project dae1848329 am e82dc760: am fb02270d: 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 our
* commit 'e82dc76054ca53dfb29c207cb61673c54b2aaeeb':
2013-10-03 14:14:10 -07:00
Satoshi Kataoka 8912bd96af am a05e1896: am 9903f419: 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 'a05e1896d11f01568b54da9177bb7e2c8a5e39bc':
2013-10-03 14:14:07 -07:00
Jean Chalard d3e1046672 am bbc6f740: am c900edce: 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 'bbc6f740bbadd0e8fae9ffc69b9b8c24697d7461':
2013-10-03 14:14:03 -07:00
Tadashi G. Takaoka 9a50515948 am 526b6d64: am 4986c095: 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.KeyTimerH
* commit '526b6d646ef5e587ee8fc56419f3ad8d0817f46c':
2013-10-03 14:13:59 -07:00
Jean Chalard 00fe5a5181 am 60eedd04: am 8e6d5fb0: 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 '60eedd04ae6076484f6eacb47bfa9c4768ce6ca2':
2013-10-03 14:10:39 -07:00