Commit graph

17072 commits

Author SHA1 Message Date
Kurt Partridge
94e388830e 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 '06917b2f057d02e3fc0a1cde6abe86be448bfb02':
2013-10-03 10:40:08 -07:00
Jean Chalard
e547b53ddb 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 keyboard handl
* commit '4b6c72a0bbf2860e81e9edb751a89f8abadd853b':
2013-10-03 10:40:04 -07:00
Tadashi G. Takaoka
888f6eada2 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 '855aa95e92c711cb364b01b6a412f511c62f0e68':
2013-10-03 10:40:00 -07:00
Satoshi Kataoka
cc34a55165 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 'f067287e93c704846e523bb1cb714b7ed6f75b84':
2013-10-03 10:39:57 -07:00
Jean Chalard
9407a2c067 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 it\'s not"
* commit 'f47c33253843c45f85dfdfa1b6f11f2b92ac860b':
2013-10-03 10:39:52 -07:00
Jean Chalard
842d3dc40f 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 '19bf4335783596269c14c50344d52d84471090a5':
2013-10-03 10:39:48 -07:00
Satoshi Kataoka
d42c151e8c 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 '110d360c68c3ccbaffd2ff5cd9a949fccae3a825':
2013-10-03 10:39:45 -07:00
The Android Open Source Project
e82dc76054 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 ours) am b35915f
* commit 'fb02270d6a11ed4ecd7a30bf732ce2a38b3b68b5':
2013-10-03 10:39:40 -07:00
Satoshi Kataoka
a05e1896d1 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 '9903f419044de3d9772931275497f01d1df1365e':
2013-10-03 10:39:36 -07:00
Jean Chalard
bbc6f740bb 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 'c900edce81e440e0e5cc8f577d59562cea3964f2':
2013-10-03 10:39:23 -07:00
Tadashi G. Takaoka
526b6d646e 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.KeyTimerHandler
* commit '4986c09541cfcfd7b6952783f181cf5810e30429':
2013-10-03 10:39:19 -07:00
Jean Chalard
60eedd04ae 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 '8e6d5fb0c2d28ff9801cfd99b8d821ec31a31096':
2013-10-03 10:39:15 -07:00
Jean Chalard
5ac77a532a am ded29a89: am 2a4a2dcf: am 00f378d6: am 6571290c: am 6e2e946d: am a1187bd0: am 8f89b9b1: am ccb3dc02: am 0eb58dfe: am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
* commit 'ded29a89eb2ccfecf1373ed8f41541ae57775fbd':
2013-10-03 10:39:12 -07:00
Baligh Uddin
7e36f1c9c0 am 29ac8dd8: am 3710ff0e: am d6f1fba4: am 0151b947: am 61076e10: am 04ef4141: am 42f36bb6: am 2456eb3a: am faa708c3: am 36583063: am 8ed884e7: am ca8ea431: am a3ed3254: am 05b7988a: am 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-
* commit '29ac8dd8a823d6a8707a005f700be8cf9ad0de1a':
2013-10-03 10:39:01 -07:00
Baligh Uddin
d138dbc6d6 am d403a860: am 41236d61: am 2f1f1df4: am f61619af: am 4fd9ca75: am 26e105b6: am 5e79a344: (-s ours) am f205c258: am dbf9168f: am b3fbdd58: (-s ours) am f939332c: am 94065faf: am c6660830: (-s ours) am 68a0afc3: am 0c777365: am fbb6500d: (-s ours) am 5bcbc21a: (-s our
* commit 'd403a860c281c97062349d872e148deeac3c5c49':
2013-10-03 10:35:28 -07:00
The Android Automerger
4adc4f950e am 6f6db1de: 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-azuk
* commit '6f6db1de7d70d2f0b29c4619f92929ed85ef2440':
2013-10-03 10:35:25 -07:00
Tadashi G. Takaoka
fdbcc802cf am 5bab3b1a: 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 liv
* commit '5bab3b1aea9c12db50c3abae3468a4a4c607f08d':
2013-10-03 10:35:21 -07:00
Tadashi G. Takaoka
4b6262c4c7 am 8e1fb94f: 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 XmlPullPar
* commit '8e1fb94f9aead5d12ee036750fbf66abea4e2312':
2013-10-03 10:35:18 -07:00
Satoshi Kataoka
5d4d38e497 am 36e702d4: 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 N
* commit '36e702d4c40220cf465c6dab9758b21662e1acb4':
2013-10-03 10:35:14 -07:00
Tadashi G. Takaoka
73991afbf9 am 88b30760: 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 XmlParserUti
* commit '88b30760b06802b6d60d5f1a3dd13a145b98b1de':
2013-10-03 10:35:11 -07:00
Baligh Uddin
bd7d255684 am ec32c116: 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 6537
* commit 'ec32c11610f14636c3cc39d0755de368272adad3':
2013-10-03 10:35:07 -07:00
Baligh Uddin
4e64b474ea am 37dfb8d7: 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 our
* commit '37dfb8d7956878a4ec45f841f3ec766257109150':
2013-10-03 10:35:03 -07:00
Baligh Uddin
f2e47e6a2a am 067bc055: 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 93c5c7a
* commit '067bc055f01f89ac6e4cada8f3d2bab6d7bc10fa':
2013-10-03 10:35:00 -07:00
Tadashi G. Takaoka
7fc84ff451 am 7957da14: 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 ArrayInd
* commit '7957da1431315c4e23870fd600cdcc5f8a31e81d':
2013-10-03 10:34:56 -07:00
Baligh Uddin
4827eb9441 am 13795faf: 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 2a01
* commit '13795fafd15ba1246a9e8d79cd64eba58b242367':
2013-10-03 10:31:37 -07:00
Baligh Uddin
8613347987 am 88c3fcce: 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 our
* commit '88c3fcce9ebbec33d909a5ceee724a3806fdd469':
2013-10-03 10:31:33 -07:00
Baligh Uddin
7466027dd8 am 99281133: 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 b4039d9
* commit '992811337d5776669689bcc456267647de563bd4':
2013-10-03 10:31:31 -07:00
Alan Viverette
a53123b48e am 3462e3f8: 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 chang
* commit '3462e3f825124f6e3d008efcf85fe6f39cacc561':
2013-10-03 10:31:27 -07:00
Satoshi Kataoka
392aab8d81 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 19a70087: Merge "Fix appname"
* commit 'bc8897d8adb237ef53bc2c8a5e4767ed8d772bd0':
2013-10-03 10:31:24 -07:00
Tadashi G. Takaoka
073e2a6040 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 3a8a63c3: Remove unused import
* commit '7632947cebaa4b45a9d792ab4d6e913f48aa2370':
2013-10-03 10:31:20 -07:00
Tadashi G. Takaoka
bf255ffc35 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 c6452f25: Merge "Remove referen
* commit '7d3abef1afbb40e050664eb3f26919dd53bb83a9':
2013-10-03 10:31:17 -07:00
Satoshi Kataoka
935e291ea6 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 f4352c2c: Merge "Use correct ap
* commit '952656e6b4f613a3773395630f929ad8235f472d':
2013-10-03 10:31:14 -07:00
Baligh Uddin
d1fc691c30 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 a3e47f87: am 74089a09: am ba0e4
* commit '94e383bb889e4d7da0afd66d435ad50fd3d9a028':
2013-10-03 10:31:10 -07:00
Satoshi Kataoka
4412ab1035 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 140b6705: Merge "Fix appname"
* commit 'ce982f9cc13347807fe5a8ca21dd8cf0c4a1ca26':
2013-10-03 10:31:07 -07:00
Tadashi G. Takaoka
8427fd62bb 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 ee91bde1: Clean up InflateExcep
* commit '524882ced51babf928bea045cd6c752b9187b97f':
2013-10-03 10:31:03 -07:00
The Android Open Source Project
3e8fbbeeb0 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 210226c5: (-s ours) am 54f0
* commit '3c70e9287cf690930eea249f8de6cf2528889563':
2013-10-03 10:30:59 -07:00
Alan Viverette
8b84296a52 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 9da7fa0f: am 559616fb: Prevent
* commit '55cefbcc3d52973bdb601758a5eacbd626b11992':
2013-10-03 10:30:56 -07:00
Jean Chalard
0520a0fc74 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 11b600b9: (-s ours) am 2f73105
* commit '00ef2f30063775520ef5428a18c7972ae66cd843':
2013-10-03 10:30:53 -07:00
Jean Chalard
c84db8d1de 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 'ea465c050f4269c99a226c4cfa8aac65f1931831':
2013-10-03 10:30:50 -07:00
Baligh Uddin
d9f69ba351 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 fc801fe8: (-s ours) am c57cf2b
* commit '26b6ed18782dae4971b1f09cb4920d26dde4ea5e':
2013-10-03 10:30:47 -07:00
Baligh Uddin
97b6fda783 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 6e0e8dd6: am 8ca085db: (-s ours)
* commit '3cd5827602077abe1dbfc4fcfbc61bd5eca82433':
2013-10-03 10:30:43 -07:00
Baligh Uddin
7eca3bd830 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: am 57b68207: Import transl
* commit '637ae0fc8f436177b78f9e1e3e0384355639da45':
2013-10-03 10:30:40 -07:00
Satoshi Kataoka
f97bffc54a 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 '949cbdc35049cd6bf46640b4784eb983b37ed948':
2013-10-03 10:30:36 -07:00
Satoshi Kataoka
9b5ffeed73 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 'b4fb829138bce995118f964231aa466a925224e4':
2013-10-03 10:30:33 -07:00
Kurt Partridge
c1576be911 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 onFinishInputView"
* commit 'd2b1da1cb13f4d35c6bb9fc27ab1287691bcd257':
2013-10-03 10:30:29 -07:00
The Android Open Source Project
3f81b2369c 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 22384b57: (-s ours) am 0ed901f
* commit 'bbf7e85477fb3b84b3db4d34720f53b07dfba53a':
2013-10-03 10:30:26 -07:00
The Android Open Source Project
fc2adc8bab 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: Reconcile with jb-mr2-rele
* commit '8a37c1fb2e39c8d70582116ecb8660c3c5cd6b01':
2013-10-03 10:30:22 -07:00
Baligh Uddin
d08c831544 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: am 4cdb7ccb: Import transl
* commit 'c7818cfc838d0190ca2516be66ae612a1bdf8422':
2013-10-03 10:30:19 -07:00
Baligh Uddin
1c6e1a629c 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) Import translations. DO NOT M
* commit '2b4d00894b366deeb95a67d4be2fb93eaab74c3c':
2013-10-03 10:30:15 -07:00
Baligh Uddin
ae5a5b4a54 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 translations. DO NOT MERGE
* commit '720c8b5e33179fdf7de563e170d012373262fcee':
2013-10-03 10:30:11 -07:00