Commit graph

18212 commits

Author SHA1 Message Date
The Android Automerger
6f6db1de7d am 6548fea2: am 0de714bf: am 1e944609: am f4ed91f5: am 8435a9b8: am abaea38f: am 13ac43b3: am 2cb2c001: am 6e6f705e: am c82a56b4: am ccc3c232: am 228e26f7: am ea46fdcb: am 65dfe94d: am 1237c872: am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history aft
* commit '6548fea280342aca38e13e23115c019cd848d8ae':
2013-09-26 06:21:32 -07:00
Tadashi G. Takaoka
5bab3b1aea am f6073bf0: am d727baf8: am 47846109: am 35c4a834: am 52a89e5a: am c7420082: am f6f20ab2: am 19b5a104: am ae3ead49: am faadc0a7: am b5843222: am 62b07bf9: am 561a04f3: am 1911c513: am abd22393: am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'
* commit 'f6073bf07f4925595a872e86095ac7eab35bce30':
2013-09-26 06:21:21 -07:00
Tadashi G. Takaoka
8e1fb94f9a am 05cede19: am d1c14f6b: am 751cce8d: am 593432e1: am e5561f52: am 707d7d03: am 9a2c21ba: am 6e536321: am 31f350bc: am fc369029: am 9c59fb54: am fc0fc521: am e01d1960: am c17e0bba: am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventT
* commit '05cede19f507f932ba6c379554c5d3babc80b6db':
2013-09-26 06:21:16 -07:00
Satoshi Kataoka
36e702d4c4 am e8b16e6f: am b053083f: am bbc44915: am 4b2cd413: am ef6e62dd: am 1ca78739: am 6a8da44f: am 5d1d7863: am 4b24e49b: am a1cd7970: am 71f1b270: am 8138c8d2: am f4f4d6c9: am b3438173: am d3c823c1: am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"
* commit 'e8b16e6fd81b7bcd7bedcdb3666cc35198d5daf3':
2013-09-26 06:21:11 -07:00
Tadashi G. Takaoka
88b30760b0 am 3a4895f7: am 2a574e0f: am 719e23e1: am 1e02d2cc: am 398c6862: am 8c897819: am b97fe385: am 47d68e5d: am 6ed9580f: am 098ecd55: am 5283b90a: am 60083e3e: am 49d59d4a: am a469cdfe: am d0495a35: am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils
* commit '3a4895f78e3ce777f011be4a07a1b8f9e0da4661':
2013-09-26 06:21:06 -07:00
Baligh Uddin
ec32c11610 am 549261fc: am e0a48595: am 38a9550b: am 608d77a1: am 352e94b0: am 13f39210: am ce453840: am 32e84531: am 8632fea5: (-s ours) am 88db1331: am 6626fb25: am 51c7dbea: (-s ours) am 4379dbea: am 324b1880: am f0213d1a: (-s ours) am c1cb4766: (-s ours) am 6537280f: am 5f97
* commit '549261fca36576a3b0a3dceead6e5570bd86221c':
2013-09-26 06:21:01 -07:00
Baligh Uddin
37dfb8d795 am 33226450: am 1ccedccf: am a7e31631: am 32e5224a: am 33a9c2b2: am c346b2dc: (-s ours) am de5560e2: am 0218ddb3: am 52d6480a: (-s ours) am f81c9132: am 1e8d1f41: am d72347f9: (-s ours) am 67f7bb2e: am 284d4285: am f0346d70: (-s ours) am fc135df5: (-s ours) am 24daa2a
* commit '332264502aac7c14d3f0c47cfe406cff703d047e':
2013-09-26 06:20:56 -07:00
Baligh Uddin
067bc055f0 am 845818b8: am 9c981de6: am e83fc873: am db9dbeee: (-s ours) am 8f89ca1d: am b233e047: (-s ours) am 062a6c02: am dbd8eec7: am 643f8f08: (-s ours) am a3328255: am 38f2bbb3: am 210d473d: (-s ours) am a62edb47: am 3d082f1b: am 14ef11a8: (-s ours) am 93c5c7a4: (-s ours)
* commit '845818b8ad8cfd97599d8438c28ef40e7ca289c4':
2013-09-26 06:20:51 -07:00
Tadashi G. Takaoka
7957da1431 am b120376d: am fc1b0808: am 19c16d9d: am 2a4ab011: am b53d753d: am d88350e2: am 2721db44: am b779b268: am 6ed94c43: am 70252ecf: am 5eb7a00e: am 1047bf17: am 32d89afa: am e2ccd61b: am 2b04e787: am 71fb8af7: am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBounds
* commit 'b120376d7ac00c58341e763ba1782478e48182e2':
2013-09-26 06:20:46 -07:00
Baligh Uddin
13795fafd1 am a97a8d0e: am ce903b44: am bbe52bc6: am a13080d6: am aa52681b: am 627db009: am ac58dcf1: am f3b10815: am 0849b210: (-s ours) am 1cf0e85d: am 97687031: am 0ad31c8d: (-s ours) am a5bc58ac: am 5301db94: am e67698be: (-s ours) am 8051fd0d: (-s ours) am 2a01fc22: am 1e5a
* commit 'a97a8d0ec09423aad5f6998a00c8c8de70b87eca':
2013-09-26 06:20:41 -07:00
Baligh Uddin
88c3fcce9e am 32764875: am 9381b26d: am 80c444c9: am 0b6762a1: am 719f8865: am 2b19100a: (-s ours) am 58a4a153: am a9a84c95: am 3d8f50ea: (-s ours) am 755db5bd: am 3a97d388: am 273a21ca: (-s ours) am 772dfa51: am ae8b69fd: am 7ea45c07: (-s ours) am 7f859d68: (-s ours) am 8636ba0
* commit '32764875c4ed3af15568b73bb1fc6938265a72e3':
2013-09-26 06:20:36 -07:00
Baligh Uddin
992811337d am ae87592e: am f91c684c: am c33a6f27: am 768c3c65: am dff9a646: am 87ad4a8c: (-s ours) am b74cc3f9: am 1a24764e: am 03fbe97c: (-s ours) am c46a975c: am 9f291d17: am 2f8e381b: (-s ours) am 92adcda6: am 42c255c2: (-s ours) am 599290d5: (-s ours) am b4039d96: (-s ours)
* commit 'ae87592ee4f39f649c175001a80d76d1930da958':
2013-09-26 06:20:31 -07:00
Alan Viverette
3462e3f825 am a02c3d8b: am 12f609e4: am 3dc70862: am 28a831de: am c795a288: am 69ef660f: am 3de1ae1a: am 849c7858: am eff2ee76: am 45b1a302: am 80a2e251: am 14f65cff: am 8e5fa88a: am f518e71a: am c5ec7545: am 8f807582: am e47ee181: am a7b4398c: Don\'t announce changes for A11y w
* commit 'a02c3d8b2edd2d51248074a70b912061f1d3d1a9':
2013-09-26 06:20:26 -07:00
Satoshi Kataoka
bc8897d8ad 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 19a70087: Merge "Fix appname"
* commit '5005bcfb12cb6d0254f36dd48c0ab8e0193b0eb8':
2013-09-26 06:20:21 -07:00
Tadashi G. Takaoka
7632947ceb 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 3a8a63c3: Remove unused import
* commit '02ce1826896f2e33f8b7dd6a1b6a7f6c44ce6ebf':
2013-09-26 06:20:16 -07:00
Tadashi G. Takaoka
7d3abef1af 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 c6452f25: Merge "Remove reference to string.
* commit '71bf7c0f6b294cbc61a4f4d909ab9b5fedb3d249':
2013-09-26 06:20:11 -07:00
Satoshi Kataoka
952656e6b4 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 f4352c2c: Merge "Use correct appname resourc
* commit '50d795d9c64130362654aed9e5bed89c30dbefb0':
2013-09-26 06:20:06 -07:00
Baligh Uddin
94e383bb88 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 a3e47f87: am 74089a09: am ba0e497a: Merge co
* commit '276547dab1f1be494b2ba4610ca55c9429be3a07':
2013-09-26 06:19:56 -07:00
Satoshi Kataoka
ce982f9cc1 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 140b6705: Merge "Fix appname"
* commit '99b03df6a65a4386fefa7b456fbb8165fdf07425':
2013-09-26 06:19:51 -07:00
Tadashi G. Takaoka
524882ced5 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 ee91bde1: Clean up InflateException referenc
* commit 'ed4dc25af71de55e36d61c5f9d90f12b79ccbdd9':
2013-09-26 06:19:46 -07:00
The Android Open Source Project
3c70e9287c 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 210226c5: (-s ours) am 54f0ae27: am a6fa
* commit '85b8dc48ce78fa3cb98bddd8b759bb5b47f2215e':
2013-09-26 06:19:40 -07:00
Alan Viverette
55cefbcc3d 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 9da7fa0f: am 559616fb: Prevent keyboard A11y
* commit '791e37803d2c137d6f16f1d90fe71a8e094bb921':
2013-09-26 06:16:23 -07:00
Jean Chalard
00ef2f3006 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 11b600b9: (-s ours) am 2f73105a: (-s ours)
* commit '1369200c1d1e22426c3d7958e7778d64857908f1':
2013-09-26 06:16:03 -07:00
Jean Chalard
ea465c050f 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 '24601d1e62c3968c26b1b40d3b8bdc518f3ba746':
2013-09-26 06:15:51 -07:00
Baligh Uddin
26b6ed1878 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 fc801fe8: (-s ours) am c57cf2b7: (-s ours)
* commit '08413e8f1e6914967a8b533aee2ea7b9b62d00b0':
2013-09-26 06:15:45 -07:00
Baligh Uddin
3cd5827602 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 6e0e8dd6: am 8ca085db: (-s ours) Import transl
* commit 'e66c1e8504f9277a1f89d5e455670f8a13635ae0':
2013-09-26 06:15:39 -07:00
Baligh Uddin
637ae0fc8f 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: am 57b68207: Import translations. DO NO
* commit 'c3ed8ac566354d9d7d7ebbe6de8439d40cf4d8fd':
2013-09-26 06:15:25 -07:00
Satoshi Kataoka
949cbdc350 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 '8f640acc9a6feaec7a7494c365fd201c22014662':
2013-09-26 06:15:20 -07:00
Satoshi Kataoka
b4fb829138 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 '6581aad72d1e68b8c3ef1418b2662458217e90fb':
2013-09-26 06:15:04 -07:00
Kurt Partridge
d2b1da1cb1 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 onFinishInputView"
* commit 'a1c6ad87c435abd81eae7efbd132c4abf8cbdee9':
2013-09-26 06:14:58 -07:00
The Android Open Source Project
bbf7e85477 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 22384b57: (-s ours) am 0ed901ff: (-s ours)
* commit '1b0bfc251d2563393db6f716eebc366ba9cfcb2d':
2013-09-26 06:14:53 -07:00
The Android Open Source Project
8a37c1fb2e 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: Reconcile with jb-mr2-release - do not
* commit '724378107a1da5691ca0c8fcdcea61749ed356e2':
2013-09-26 06:14:48 -07:00
Baligh Uddin
c7818cfc83 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: am 4cdb7ccb: Import translations. DO NO
* commit '0fc3659ad69d7f42c90e2450baff844971455038':
2013-09-26 06:14:25 -07:00
Baligh Uddin
2b4d00894b 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) Import translations. DO NOT MERGE
* commit '033d5a132e6262e10e68fc5c846caa671fc7ae61':
2013-09-26 06:14:20 -07:00
Baligh Uddin
720c8b5e33 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 translations. DO NOT MERGE
* commit 'b242d5aca17068f88329b6a2f9a983462c26b8a3':
2013-09-26 06:14:15 -07:00
Satoshi Kataoka
3d8bceb781 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 '51e78c317f3b76333853f21be34b0c5754f0ac87':
2013-09-26 06:14:10 -07:00
Jean-Baptiste Queru
a82168948a 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: Merge 2caa1d81ce
* commit 'f02923c546642a77efcf2acff2fafcadfa8cb752':
2013-09-26 06:14:05 -07:00
Kurt Partridge
aab6efb200 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 '8808a1fdf7547ed49ad102a4a2a3225475007f25':
2013-09-26 06:14:00 -07:00
Tom Ouyang
502c1a991e 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 'd8b1a5290d5f70ab47be1ce0a73be4c3d066a14f':
2013-09-26 06:13:55 -07:00
Tom Ouyang
c050fd3623 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 'ff4fa29039568294a27895364a407e1413ec71a3':
2013-09-26 06:13:50 -07:00
Kurt Partridge
19ab3127c9 am 4e70a387: am 1b55e9de: am 19749e3d: am 07cc9c07: am d40d2f35: am eba670d0: am 6267ec68: am 3e1f652c: am 099dd3f2: Merge "Better release build reporting"
* commit '4e70a387f5ae739e133b3030fc67e503952eb616':
2013-09-26 06:13:45 -07:00
Baligh Uddin
f5f75e57d7 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 MERGE
* commit '5ff9749fd754dfb1c28e807fa1eaaf7e77691be4':
2013-09-26 06:13:40 -07:00
Baligh Uddin
03c8daf655 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 '20ce33946d54475ae4405d100893f987d7b6ae24':
2013-09-26 06:13:35 -07:00
Jean Chalard
d72265fce7 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 '6fb19dee55fdb763a88bd3090e7b099ac66013c6':
2013-09-26 06:13:30 -07:00
Tadashi G. Takaoka
2f03f38507 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 'e1e729b6a813a69893846394c3d86932992e2c3a':
2013-09-26 06:13:25 -07:00
Tadashi G. Takaoka
15d6cd0e0b 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 '76ab7fac1b16e065628f1220f6c07a730176cfca':
2013-09-26 06:13:20 -07:00
Tadashi G. Takaoka
fd15d725bc 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 'c279efed121416e4b9f2a498f69725a50a30c2f0':
2013-09-26 06:13:15 -07:00
Jean Chalard
3e0195c68c am 59ec247a: am 419cf734: am e81f1c43: am 4168d0b5: am 1792b892: am f514024a: am 818b7d46: am 80d7ed0b: am 4f430763: Fix a faulty test
* commit '59ec247a67fdfe9978e095d21eae833c39319d1a':
2013-09-26 06:13:10 -07:00
Jean Chalard
96c05662f1 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 '1b912384ad69b13e569963f6d7b3fc48dc1750bc':
2013-09-26 06:13:05 -07:00
Tadashi G. Takaoka
48ef0965ab 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 '6c9533d474aea604f509dc513d1de57cd9e32d27':
2013-09-26 06:13:00 -07:00