Commit Graph

21068 Commits (e5a4bac1353c9323ead55d508fd04309f1023cea)

Author SHA1 Message Date
Satoshi Kataoka 91464af1db am 285cdd65: am 392aab8d: am bc8897d8: am 5005bcfb: am 291c9f40: am 363394c9: am 04708a32: am d1935d05: am d0642a34: am 775ef9bc: am cb132ce1: am 81295fd2: am 119e6979: am 745725e1: am 103b1118: am 33c91be3: am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70
* commit '285cdd65601750933890b96ea103f3f077552108':
2013-10-03 15:54:39 -07:00
Tadashi G. Takaoka 074aeed21e am b121003a: am 073e2a60: am 7632947c: am 02ce1826: am c82a6144: am 4a12a2b6: am bfb18559: am 37232a10: am 58db8c60: am c0d71c3b: am 3a2e78f9: am 30d9817b: am 7dcc22b6: am 5f81bb8c: am 3ef47fd3: am e0aa9383: am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a6
* commit 'b121003ab2ad3b128a78e1483ea6c5e85127bfad':
2013-10-03 15:54:37 -07:00
Tadashi G. Takaoka 7be8ad8b1d am d859338a: am bf255ffc: am 7d3abef1: am 71bf7c0f: am c13ad1dc: am 05e54e59: am 9faf1961: am c1e417dd: am e010bb8a: am 18be37b0: am 96d53923: am 104923e4: am 863d83ea: am 02a59e55: am 1f722ca9: am 4e627c21: am 56796cd7: am 4841df87: am bb679a22: am 3d0fee4e: am c6452
* commit 'd859338ae9dd5a18c8d5a8049fdecf165d449bd9':
2013-10-03 15:54:34 -07:00
Satoshi Kataoka cf21001cd0 am 72a84117: am 935e291e: am 952656e6: am 50d795d9: am 6319b0fe: am e0e7b78f: am eecbcea7: am 4bb35fea: am 8e8ea448: am 9e78d2ba: am 54f46879: am 1af04dc6: am 249ad4d5: am 79376326: am f555b255: am 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352
* commit '72a841179197c1e67ea5139e3ad905226a02fad0':
2013-10-03 15:54:31 -07:00
Baligh Uddin c51a0f6750 am c82913a7: am d1fc691c: am 94e383bb: am 276547da: am 0bd99dad: am dbff15a9: am af1ca413: am daad9c68: am 5bc76be0: am 15a357a3: am 2060aa13: am 97046d19: am 1d024eca: am 307d2aa2: am 8e48a618: am 18e45a93: am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47
* commit 'c82913a773d36e7541282d91853115408095b4d9':
2013-10-03 15:54:28 -07:00
Satoshi Kataoka 856f398afa am 9c03682c: am 4412ab10: am ce982f9c: am 99b03df6: am 75939dc1: am 32d5b4e3: am 29370f41: am 204243c3: am 071c3c6d: am e8374789: am 9e45f9e8: am 24cf39e7: am 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6
* commit '9c03682c2073ce4ecec4c158a97507a3a91479c1':
2013-10-03 15:54:26 -07:00
Tadashi G. Takaoka f6b1bb1ab9 am b49683c3: am 8427fd62: am 524882ce: am ed4dc25a: am b9b47104: am e9716016: am 217fe877: am eeb0459e: am a446f8f7: am fd06763b: am 7bc7bd79: am 59b23bcf: am 680d689d: am c61393c8: am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91b
* commit 'b49683c3008175ed96147097e30b1cdc10d62666':
2013-10-03 15:54:19 -07:00
The Android Open Source Project ede353daac am 96e3bdb8: am 3e8fbbee: am 3c70e928: am 85b8dc48: am 9faf3e64: am 461a0480: am be7561c2: am 41b61150: am adef73a7: am eb2fee1d: am 7db5bfa0: am 20995333: (-s ours) am 5d674b16: am 55172624: am b2c2ce31: (-s ours) am 7de82b0e: am 6ab186a1: am c4176236: (-s ours) am 2
* commit '96e3bdb885c67c50a1e333c29dd8391eca92db67':
2013-10-03 15:54:16 -07:00
Alan Viverette 88ed711b1b am 2e2feec5: am 8b84296a: am 55cefbcc: am 791e3780: am 7ba85ad2: am 74f99743: am 77deeefe: am 3694cc82: am e4f98a02: am 79ef0a17: am 4b45830a: am 7c9b7f24: am e592be58: am 046a311a: am d19c71d9: am 3c082157: am 44678fcf: am f1bcc1d7: am 9ecac40d: am 4f11af0c: am 9da7f
* commit '2e2feec56f67dd090df847e1fda0e7417250080e':
2013-10-03 15:54:14 -07:00
Jean Chalard a741504ba6 am 8cab4b32: am 0520a0fc: am 00ef2f30: am 1369200c: am baa4a50b: am 97b579d5: am efd85328: (-s ours) am c825c557: am b2af86cf: (-s ours) am c5424013: am 186cf922: am 288deb7a: (-s ours) am 11034c34: am dee08de2: am 724ff298: (-s ours) am 4ddfde7b: am a050834c: am 11b6
* commit '8cab4b32326c7fa85287fc2279273fd52316ff3d':
2013-10-03 15:54:12 -07:00
Jean Chalard 3c686cf877 am 685b075b: am c84db8d1: am ea465c05: am 24601d1e: am b12b3b07: am 66833def: am dd0e671a: am 30439651: am a4156a8e: am 5a59a986: am 2cef4323: am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit '685b075bd5978983e48d3453f78a45e47012dc33':
2013-10-03 15:54:09 -07:00
Baligh Uddin 17db1468e0 am 60d58582: am d9f69ba3: am 26b6ed18: am 08413e8f: am 02b8fc7b: am 7916a5d2: am 6da2f050: (-s ours) am 79971a1f: am 8a0205e2: (-s ours) am 2d607977: am e04cee4f: am 49201626: (-s ours) am 0b758ec7: am e7edb561: am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc80
* commit '60d5858218af36dc69a0e735d66fc86a60cecaae':
2013-10-03 15:54:06 -07:00
Baligh Uddin 15b058b2cf am b54a9e60: am 97b6fda7: am 3cd58276: am e66c1e85: am e553f0e9: am 7a68cf1e: (-s ours) am 6686f6ee: (-s ours) am ea151032: am 4d085cfa: (-s ours) am ffb269b1: am 3df28d14: am 14d778b2: (-s ours) am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd
* commit 'b54a9e60802f702d8104135be55a0b77cfc4b64c':
2013-10-03 15:54:03 -07:00
Baligh Uddin 580d6c87a4 am 2d8c4674: am 7eca3bd8: am 637ae0fc: am c3ed8ac5: am 582bbf20: (-s ours) am 39177323: (-s ours) am 4c2b9e46: (-s ours) am e0789c73: am 9ef4b7dd: (-s ours) am bc1bc4d0: am 719e5729: am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9:
* commit '2d8c46742cac8633bb9fdd60018e61cb30bd5381':
2013-10-03 15:54:01 -07:00
Satoshi Kataoka 516ebca744 am 224892d8: am f97bffc5: am 949cbdc3: am 8f640acc: am 207ede4f: am 8af0cc2e: am 9da909d1: am dcfff5c0: am 4109952b: am 7a4430ac: am 5db28826: am b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit '224892d8ea4ff9aadb5c284509c925c7c20f5f3c':
2013-10-03 15:53:58 -07:00
Satoshi Kataoka 3c50d9b49f am 60317428: am 9b5ffeed: am b4fb8291: am 6581aad7: am d0776552: am 795895e1: am f368fdb6: am 3d82dbca: am d3022faf: am 01eb9b25: am 71f828b1: am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit '60317428020fe713eeb2a8a6ab4f98a1b2138030':
2013-10-03 15:53:55 -07:00
Kurt Partridge d850f97267 am 7bac0700: am c1576be9: am d2b1da1c: am a1c6ad87: am 1e5d5eac: am 4d4cb019: am c68eb70a: am 023bee60: am abf64529: am 66366029: am a6092dc8: am 504bbe38: am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon o
* commit '7bac07002acb2d8a72036b4e0b7c0d8b4143b170':
2013-10-03 15:53:52 -07:00
The Android Open Source Project 1fdce5fc2e am 58a6b71e: am 3f81b236: am bbf7e854: am 1b0bfc25: am 83827f33: am 258784da: am 37f22676: (-s ours) am b241b243: am 740243cb: (-s ours) am cf0c1a7d: am 19289df5: am e279de02: (-s ours) am ab6fa041: am e72a088f: am a6dcb55e: (-s ours) am 62adeccd: am 577f08a3: am 2238
* commit '58a6b71e00b07296ed13173c1d8889aa60f925f7':
2013-10-03 15:53:50 -07:00
The Android Open Source Project a9d5458238 am 05f38a8b: am fc2adc8b: am 8a37c1fb: am 72437810: am 6d5d6c0a: (-s ours) am 10f50a1b: (-s ours) am 3f031112: (-s ours) am 3675b5bb: am 1996320a: (-s ours) am faa9a5ec: am d9f9ba39: am 4b176a01: (-s ours) am 83346295: am 2c7b1b82: am d2582473: (-s ours) am 22953740:
* commit '05f38a8b431993ba9575d33f1cb2ed476783c3ef':
2013-10-03 15:53:47 -07:00
Baligh Uddin 081b2fd7aa am 4db24fdd: am d08c8315: am c7818cfc: am 0fc3659a: am d1af11ed: (-s ours) am 08f53d3c: (-s ours) am d28727d9: (-s ours) am 480ebe79: am 403354ba: (-s ours) am bc5075e0: am 536ec3bf: am b4fbb295: (-s ours) am d3ae58ef: am 3bc22c56: am e7d91194: (-s ours) am 370070ae:
* commit '4db24fdd724638825a1096475b2bc27acc759493':
2013-10-03 15:53:44 -07:00
Baligh Uddin 5ff55b7262 am e6b8361a: am 1c6e1a62: am 2b4d0089: am 033d5a13: (-s ours) am ea8146e0: (-s ours) am 7c692a83: (-s ours) am d31b88ab: (-s ours) am 7c9a29d5: am 2c71e826: (-s ours) am 4d5ebdf5: am f420e3bf: am 792abb73: (-s ours) am 3c163ec1: am ac68b5ce: am 4b8494c4: (-s ours) Imp
* commit 'e6b8361ad208c8cc2f9b1f6bc7cf5a94ce18cf05':
2013-10-03 15:53:41 -07:00
Baligh Uddin bdfd52abb9 am 6cd98b80: am ae5a5b4a: am 720c8b5e: (-s ours) am b242d5ac: (-s ours) am 07afd456: (-s ours) am 01f2d0d3: (-s ours) am 097dee9d: (-s ours) am dd3aa373: am 9f2573e4: (-s ours) am ea0d7ecd: am 82c49d74: am c1f3a801: (-s ours) am 8acb56b6: am 128ab7e5: Import translati
* commit '6cd98b802f714a27d2727f0371332ff0582d43d1':
2013-10-03 15:53:38 -07:00
Satoshi Kataoka ffe66eaead am 82ea6bd6: am d11b3b0d: am 3d8bceb7: am 51e78c31: am 7b711133: am 5b116569: am 659774af: am 24c86a66: am 4c767c81: am b2230d90: am 62f52e4f: am a514e958: am a2b129e9: am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
* commit '82ea6bd6016db5b5cc1d3b739365198092ea0bfa':
2013-10-03 15:53:35 -07:00
Jean-Baptiste Queru 90ee9d88ca am cb2685fa: am 80623ab7: am a8216894: am f02923c5: am 47145aab: (-s ours) am 9e6c86fb: (-s ours) am d535416e: (-s ours) am 68dcdeed: am 6e5857cb: (-s ours) am 67953e4d: am 626dd2a0: am 784eda74: (-s ours) am d9f35e32: am a21bec13: am 30667266: (-s ours) am 5bcb3876:
* commit 'cb2685fa1106be9fdc3a9db5ca997a8dbd31f78e':
2013-10-03 15:53:33 -07:00
Kurt Partridge abfc15c315 am 0ced111c: am 643a9f2a: am aab6efb2: am 8808a1fd: am 59419126: am f775fa34: am e64ec6e1: am fb4da969: am 89ccc962: am 9cf39372: am 94c441a4: am cdaee868: Merge "Preserve a class for testing"
* commit '0ced111c3c0bd7bf11a8e14524b7a055b2e9e1c4':
2013-10-03 15:53:31 -07:00
Tom Ouyang f8b9c89546 am 88a25b5a: am 38304f84: am 502c1a99: am d8b1a529: am 72470f4d: am 454ac2b5: am 607c566c: am bcefab0c: am 44eabffc: am e9de986d: am f08c75f2: am fd9f3d97: Add ability to handle digraphs in gesture and tap typing
* commit '88a25b5ab7325a349c5bc553589d79665b51e8ee':
2013-10-03 15:53:29 -07:00
Tom Ouyang 3512e13dbc am cfeba997: am 10f1c682: am c050fd36: am ff4fa290: am bdec4e5a: am 616fabde: am 94e209c5: am 0fe18452: am 0de0fa3b: am 0ca76c94: am 38a9e5a5: am b6e1777d: Merge "Add mechanism to handle digraphs in DicNode"
* commit 'cfeba9976503c9c4fa4cf7cfbc4362855b51d2ae':
2013-10-03 15:53:27 -07:00
Kurt Partridge d557dbdc17 am 640ee854: am bbebf668: am 19ab3127: am 4e70a387: am 1b55e9de: am 19749e3d: am 07cc9c07: am d40d2f35: am eba670d0: am 6267ec68: am 3e1f652c: am 099dd3f2: Merge "Better release build reporting"
* commit '640ee854b1211986f350567f0f9f70b13835924e':
2013-10-03 15:53:24 -07:00
Baligh Uddin 493ad96c0a am a67d48fa: am bb49aac1: (-s ours) am f5f75e57: (-s ours) am 5ff9749f: (-s ours) am 829605ac: (-s ours) am 17595bde: (-s ours) am 98fa49d5: (-s ours) am 265eed2b: am 7c0257ae: (-s ours) am 60ffda41: am 5bbf4f30: am cc42e139: (-s ours) Import translations. DO NOT MERG
* commit 'a67d48fa4169a65bdc088cf7ba11e0dd48fc859a':
2013-10-03 15:53:22 -07:00
Baligh Uddin 4a832423fc am 0ade0e6a: (-s ours) am 327de990: (-s ours) am 03c8daf6: (-s ours) am 20ce3394: (-s ours) am 9f6c43e9: (-s ours) am 836db9be: (-s ours) am 879d9c28: (-s ours) am 93e873cf: am b155cedc: (-s ours) am 855b8053: am d86e14ae: Import translations. DO NOT MERGE
* commit '0ade0e6a1475664d4747ee76e2c852f5b2b3a996':
2013-10-03 15:53:20 -07:00
Jean Chalard a9711b1075 am 62889708: am 68f7f50a: am d72265fc: am 6fb19dee: am 880ac788: am 6ecb9825: am cbecd375: am 56e03dd3: am 9129c0d1: am 7503ef33: am cd51b80a: am fb3e8057: Merge "Fix a bug where a space would not be inserted before a gesture"
* commit '6288970836e59673c3d5bd4b245b4adb064a3395':
2013-10-03 15:53:18 -07:00
Tadashi G. Takaoka 8aac7054c7 am 2163d085: am 0f1fc9f9: am 2f03f385: am e1e729b6: am 39b25828: am 4bc899e6: am 8d38f574: am 7d4f0961: am ef2d1555: am c627f642: am 9a6ff5dc: am c7d41589: Merge "Use private object as a lock instead of synchronized method"
* commit '2163d085f27ecbe3c7cc3ba21fe944fc571fc731':
2013-10-03 15:53:15 -07:00
Tadashi G. Takaoka f2332757b2 am e5583801: am fa000043: am 15d6cd0e: am 76ab7fac: am 91c404ba: am 4d6bb7dc: am 6fe0a646: am 38af721f: am 44905316: am 45163044: am 1502d977: am 12e77de2: Merge "Use private lock object instead of synchronized method"
* commit 'e5583801605ee8b2daebd69f7184c380cb597616':
2013-10-03 15:53:13 -07:00
Tadashi G. Takaoka 4f808406cb am 3a321541: am 917c4e67: am fd15d725: am c279efed: am 45b2d7bb: am 3f968e9b: am 869aebcc: am 45a1fbd4: am 70a79ee6: am 8ea774eb: am 14950497: am 1e256f58: Merge "Protect simultaneously modifying gesture preview data"
* commit '3a3215414d47a5bb30d81ce994b274f0a1ce9a76':
2013-10-03 15:53:10 -07:00
Jean Chalard 00460bbfcb am ab0a0a00: am da897648: am 3e0195c6: am 59ec247a: am 419cf734: am e81f1c43: am 4168d0b5: am 1792b892: am f514024a: am 818b7d46: am 80d7ed0b: am 4f430763: Fix a faulty test
* commit 'ab0a0a00ab20aec60e84fd8075bba5ddc91df4d4':
2013-10-03 15:53:08 -07:00
Jean Chalard 594c18cb94 am 3a0b7c2d: am 58aba661: am 96c05662: am 1b912384: am 3955d9fa: am 98f1d046: am e40d883f: am 0cfbc7c6: am 8e7e9df1: am 99e91fc8: am 2dd2e2d7: am 99b93d17: Fix a bug where autocorrection status would be wrong.
* commit '3a0b7c2dc168f2edcbe2583446fa7e8ea456547d':
2013-10-03 15:53:06 -07:00
Tadashi G. Takaoka 54ed0cea0f am 7659b984: am cde9aa84: am 48ef0965: am 6c9533d4: am e53d0edd: am a2d064a1: am 6de62a6b: am b3f31ea6: am 21dd8537: am 9a0f6ef8: am c35bca68: am 262d5bd9: Don\'t override EXTRA_SHOW_FRAGMENT if exists
* commit '7659b984f6c4f4b19c1e02a286e2168b30922570':
2013-10-03 15:53:04 -07:00
Tadashi G. Takaoka 23170426c9 am 043388cb: am 5d2549ba: am 3727bbd4: am 5ab9d963: am b4772213: am 09f28910: am 85ee1317: am 367fe0c3: am f8a1317f: am f0a4508a: am f5aa2fd5: am 10af4b6e: Merge "Separate StringUtils.capitalizeFirstCharacter"
* commit '043388cbb8837a47faecd01ae04473d51ffad818':
2013-10-03 15:53:01 -07:00
Keisuke Kuroynagi c83b9a2a3d am bd89311c: am 459fa6f5: am 9348576c: am 3d0a06e6: am 5816e1d9: am 6415e676: am f610ea30: am e3997340: am cde21724: am 5c7c36e3: am e81c1678: am 87fdde6e: Typing double letters via a \'circle\' on the key.
* commit 'bd89311c7347d1a6c6e4c6bd519c009bf7b7cc48':
2013-10-03 15:52:59 -07:00
Tadashi G. Takaoka 24002e0084 am 158e2937: am e9c457c9: am 01584c88: am da632d9c: am dbe34353: am 9b20d045: am ea501891: am eea5453c: am 86726e21: am 6f6edd76: am ae8a941e: am f606fd85: Hide Setup Wizard icon for stock keyboard
* commit '158e2937aa2e9dd547df0b874a333c35e495f313':
2013-10-03 15:52:56 -07:00
Tadashi G. Takaoka a9da8260a2 am c19d7fa6: am 0d9f6429: am 8156d363: am 33c6e923: am 2ea83477: am a5eea64d: am c98d4370: am 336bfb2f: am a51ddebb: am 0d9164ec: am 0d7499bc: am 4fdfce6d: Merge "Refactor SpellCheckerProximityInfo as extending ProximityInfo"
* commit 'c19d7fa6e59d552d4588bc8a7638314792e12beb':
2013-10-03 15:52:53 -07:00
Tom Ouyang ea3cabaa20 am 731560a9: am be8acf9f: am 76834814: am f1e4f622: am 305d6cd2: am dda4915b: am 9de571ff: am 1711cee0: am 20d54cab: am 6a0f11cc: am ff981cc3: am 43779c04: Merge "Add method to get dictionary flags from DicTraverseSession"
* commit '731560a96a70cf28fa3039367174d399a400e8d9':
2013-10-03 15:52:50 -07:00
Baligh Uddin 7f9ce3da29 am 1679f35e: am 8dc708ea: (-s ours) am 124a4a88: (-s ours) am 0eca14b3: (-s ours) am df18e529: (-s ours) am 7f6e0817: (-s ours) am 680b09d3: (-s ours) am f96989dd: am fe4c83c6: (-s ours) am 1646267f: am 8e7ca6be: am 224e969e: (-s ours) Merge "Import translations. DO N
* commit '1679f35e412f563fcb0a94035d6ada319f27da44':
2013-10-03 15:52:47 -07:00
Baligh Uddin 9441e35c15 am c007ed34: (-s ours) am c549a905: (-s ours) am b0db40b8: (-s ours) am 51c0364f: (-s ours) am 28443cc4: (-s ours) am bffc5b05: (-s ours) am 29faddc4: (-s ours) am 0063ed45: am 79dcc4f0: (-s ours) am 2eede9f4: am 13811400: (-s ours) Merge "Import translations. DO NOT MERGE" int
* commit 'c007ed3407268feffeca8386c8839104a3d38b46':
2013-10-03 15:52:45 -07:00
Kurt Partridge a41a0e2d03 am 4911e56a: am ada77b85: am ab39c85d: am 53dc9bce: am 62896e62: am 5dda13c0: am cb121fa8: am 24ba5149: am 436008fe: am d3497938: am ab8f166e: am 09ab6495: Merge "[FileEncap18] Clean up uploading scheduling"
* commit '4911e56a3644bc26999a197f2dd2c022e85087a5':
2013-10-03 15:52:42 -07:00
Kurt Partridge 2c4b1e3085 am 69b67ee9: am 77dd7884: am 0fb40dd0: am 8f30a74d: am 923d8ba4: am da086b24: am b1767bc4: am 40070707: am 7a172175: Merge "Fix user recording dialog"
* commit '69b67ee9e23405068365dac7f229c69fb7ce9992':
2013-10-03 15:52:40 -07:00
Kurt Partridge 18c17e76bd am 81a64a10: am 98b11fa0: am 2d2a508f: am 470632b9: am 891152fd: am 2ffa7aef: am 5abe65f1: am 72ca59bc: am 0833b3cb: Merge "Fix alarm bug"
* commit '81a64a10196ac8bbe11b55c74f178aa2937b8697':
2013-10-03 15:52:37 -07:00
Kurt Partridge 33f2954cfd am 6bb76fc9: am 9bc70bf6: am 9afca8be: am 38633094: am aa09dc17: am b3d0ada6: am 453b371d: am 1019c630: am a1913301: Merge "Avoid duplicate MotionEvents"
* commit '6bb76fc90d992fc6f448870d27b6da15e5bbd3ea':
2013-10-03 15:52:34 -07:00
Kurt Partridge e9632b6c19 am edbed310: am 06f8fc4b: am 1839c07b: am 518d0b24: am db17d68c: am 5ce4b09f: am 10270196: am a2a29050: am b903f103: Merge "Label logUnits after LatinImeOnEndBatchInput"
* commit 'edbed3100c128cf6c74f3304552e80a2f9daf169':
2013-10-03 15:52:31 -07:00
Kurt Partridge c46d6a5fb1 am 9278d1fa: am 5b75b4c0: am 3395d08d: am c56a9ded: am 9ed2d091: am 35f2616d: am 86b2c57c: am f5864fbb: am a5bfac5b: Merge "Fix NPE"
* commit '9278d1fa28f66e79fef7ccda08dc7e7cee07820f':
2013-10-03 15:52:28 -07:00