OSDN Git Service
Baligh Uddin [Sun, 6 Jul 2014 18:39:49 +0000 (18:39 +0000)]
am
5195064e: (-s ours) am
6e90b3c0: (-s ours) am
f1c1e725: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
5195064e8280c85fbda996df58e247e8a8509d1f':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:33:33 +0000 (18:33 +0000)]
am
03c248aa: (-s ours) am
51ad6520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
03c248aadece8459d2568dd8721d46cf748c7a56':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:33:29 +0000 (18:33 +0000)]
am
b140440e: (-s ours) am
6b7d2cf7: (-s ours) am
f67d4baf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
b140440ea33ce512ba372deb11171ac688b1200b':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:33:26 +0000 (18:33 +0000)]
am
75a54319: (-s ours) am
6df13287: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
75a543193546525908c94981721a5d19f31fe285':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:33:22 +0000 (18:33 +0000)]
am
3b7b9f95: (-s ours) am
334c84cf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
3b7b9f95a920e9b97067bc8004bd96156bcd8f7e':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:33:04 +0000 (18:33 +0000)]
am
6e90b3c0: (-s ours) am
f1c1e725: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
6e90b3c078baa2b6c6398376490b7c540309be70':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:29:18 +0000 (18:29 +0000)]
am
b14aee38: (-s ours) am
add3fb66: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
b14aee38b65d1896f51a31c428c1eb387709597a':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:29:13 +0000 (18:29 +0000)]
am
bd9866d3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
bd9866d3e8ea9deb5b0bd5614a940cde841222ab':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:29:03 +0000 (18:29 +0000)]
am
51ad6520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
51ad6520b6d7870dc26d20139cc3a934dfb994f6':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:28:54 +0000 (18:28 +0000)]
am
6b7d2cf7: (-s ours) am
f67d4baf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
6b7d2cf77d28922a8e81730e2a462aab258dfe68':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:28:50 +0000 (18:28 +0000)]
am
6df13287: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
6df132872faa605304ab9dc488cc589580742a28':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:28:47 +0000 (18:28 +0000)]
am
334c84cf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
334c84cfe60cd938317d0a3ee1a47c5cc8331077':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:25:58 +0000 (18:25 +0000)]
am
f1c1e725: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f1c1e725ec44aab7ebc5c4530133b169ddb6f73e':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:21:51 +0000 (18:21 +0000)]
am
f67d4baf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f67d4bafee9ab60912add98ad4ec0697d3e231fc':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:21:24 +0000 (18:21 +0000)]
am
c1f450dc: (-s ours) am
fd5e4617: (-s ours) am
f2e29071: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c1f450dc64d43c0893858538c96fd0a1e7992565':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:21:20 +0000 (18:21 +0000)]
am
16b3c375: am
026d5d21: Merge branch \'klp-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-ub-dev
* commit '
16b3c3750f9a6ea13f313eb5e76ae3adbfb6fc83':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:21:16 +0000 (18:21 +0000)]
am
ac572525: (-s ours) am
e885a9ca: (-s ours) am
eb17f6ab: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
ac572525dfe2664bc2bd4fea510c3ca5e600648a':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:21:15 +0000 (18:21 +0000)]
am
add3fb66: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
add3fb664a7e245caf86facc1855d8b9ce4281be':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:21:13 +0000 (18:21 +0000)]
am
200e21c5: (-s ours) am
57a85cee: (-s ours) am
77c61120: (-s ours) Import translations. DO NOT MERGE
* commit '
200e21c58996d76eb16e85963ca6c44770f9db05':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:15:28 +0000 (18:15 +0000)]
am
ca78b88e: (-s ours) am
b84a800c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
ca78b88eaa4d8b14d2dc1347f65715d2008e2974':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:15:24 +0000 (18:15 +0000)]
am
f6020778: (-s ours) am
562d8cc7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
f6020778cd651dbec3ae907dde7880b4c0ef66c4':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:15:20 +0000 (18:15 +0000)]
am
037bcb40: (-s ours) am
f617f4d0: (-s ours) Import translations. DO NOT MERGE
* commit '
037bcb4022432b6bee530964ae6b96c8e81c7768':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:13:04 +0000 (18:13 +0000)]
am
fd5e4617: (-s ours) am
f2e29071: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
fd5e46171db33fc2f5dcb6fbfbb6b19e36e9b485':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:12:41 +0000 (18:12 +0000)]
am
026d5d21: Merge branch \'klp-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-ub-dev
* commit '
026d5d21e1de6ba1a085059bb9a6c959690dc994':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:12:38 +0000 (18:12 +0000)]
am
e885a9ca: (-s ours) am
eb17f6ab: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e885a9ca9b54aec74dc78de1fab0f2efeb910046':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:12:35 +0000 (18:12 +0000)]
am
57a85cee: (-s ours) am
77c61120: (-s ours) Import translations. DO NOT MERGE
* commit '
57a85ceed620a2c13dfddfbe702a1baee0076343':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:08:28 +0000 (18:08 +0000)]
am
f2e29071: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f2e29071079ab67d6ed66852f6a6f5d4f1ee8753':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:08:27 +0000 (18:08 +0000)]
Merge branch 'klp-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:08:20 +0000 (18:08 +0000)]
am
b84a800c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
b84a800c173d6f6690568b59be0708c8dcb9fb4d':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:08:20 +0000 (18:08 +0000)]
am
eb17f6ab: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
eb17f6ab69ce9dda043c17827351522a8bcc2613':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:08:17 +0000 (18:08 +0000)]
am
77c61120: (-s ours) Import translations. DO NOT MERGE
* commit '
77c6112089e3fb58189b69f56f14b55a94c6b0da':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:08:16 +0000 (18:08 +0000)]
am
562d8cc7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
562d8cc7bc203a03ed20f1dbf25ef5f3f80c4705':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:08:13 +0000 (18:08 +0000)]
am
f617f4d0: (-s ours) Import translations. DO NOT MERGE
* commit '
f617f4d074886949f48e0f1c507f76d917a7f2b2':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:07:09 +0000 (18:07 +0000)]
am
30a777ef: (-s ours) Import translations. DO NOT MERGE
* commit '
30a777ef5bea16605aea06dd7b545938d019b28f':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 22:42:53 +0000 (15:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia07b3b246f397eda9216449403dd283e02f69c42
Auto-generated-cl: translation import
Baligh Uddin [Sat, 5 Jul 2014 22:40:58 +0000 (15:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7fc09c4e2f022c81a461d7228727ddc84ad6bb96
Auto-generated-cl: translation import
Baligh Uddin [Sat, 5 Jul 2014 22:10:35 +0000 (15:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I75c29be2b22f6cf19a373c4be07f7a8410a14cb1
Auto-generated-cl: translation import
Nick Kralevich [Sat, 5 Jul 2014 17:22:51 +0000 (17:22 +0000)]
am
7228aa10: am
42b74e23: Merge "Typo in method name: Clone"
* commit '
7228aa109aaef18b8447b369ae2a90cecf2c9601':
Typo in method name: Clone
Nick Kralevich [Sat, 5 Jul 2014 17:17:47 +0000 (17:17 +0000)]
am
dbed61c8: am
ca2df286: Merge "Fix typo in the exception message."
* commit '
dbed61c860367cead2767c66699eaf8c7bba59cf':
Fix typo in the exception message.
Nick Kralevich [Sat, 5 Jul 2014 17:17:40 +0000 (17:17 +0000)]
am
d05a0743: am
a347ece5: Merge "Fix typo in comment of FragmentTransaction"
* commit '
d05a0743484da59d341792749a3cf35f18a7e11c':
Fix typo in comment of FragmentTransaction
Nick Kralevich [Sat, 5 Jul 2014 17:16:59 +0000 (17:16 +0000)]
am
42b74e23: Merge "Typo in method name: Clone"
* commit '
42b74e231d893f553e4e8c88641e056ebcf82ac5':
Typo in method name: Clone
Nick Kralevich [Sat, 5 Jul 2014 17:11:47 +0000 (17:11 +0000)]
am
ca2df286: Merge "Fix typo in the exception message."
* commit '
ca2df28678352ea72cfb8a680796d0a908b2453b':
Fix typo in the exception message.
Nick Kralevich [Sat, 5 Jul 2014 17:11:42 +0000 (17:11 +0000)]
am
a347ece5: Merge "Fix typo in comment of FragmentTransaction"
* commit '
a347ece5a77d4b695af6255d751d98dbb519ad74':
Fix typo in comment of FragmentTransaction
Nick Kralevich [Sat, 5 Jul 2014 17:06:18 +0000 (17:06 +0000)]
am
e1d8ee41: am
ce259483: Merge "Added missing brace."
* commit '
e1d8ee41c0567417c1d0486c0778673cfa9b75ee':
Added missing brace.
Nick Kralevich [Sat, 5 Jul 2014 17:06:11 +0000 (17:06 +0000)]
am
664ec0a6: am
77491ac0: Merge "Correct typo in doc comment"
* commit '
664ec0a6e6cedf47adc54f2e0cd8f1435d699b72':
Correct typo in doc comment
Nick Kralevich [Sat, 5 Jul 2014 17:06:04 +0000 (17:06 +0000)]
am
f397f6f1: am
a2e4ce2b: Merge "Fix typo - issue 56671"
* commit '
f397f6f10dc1d99182bc3903d4e3751d348a3320':
Fix typo - issue 56671
Nick Kralevich [Sat, 5 Jul 2014 17:05:58 +0000 (17:05 +0000)]
am
c43f3eb6: am
8b333467: Merge "fix trivial typo: s/meansure/measure"
* commit '
c43f3eb67bbf60af61b3cd18bc5b6a684c8744c6':
fix trivial typo: s/meansure/measure
Nick Kralevich [Sat, 5 Jul 2014 17:03:50 +0000 (17:03 +0000)]
am
ce259483: Merge "Added missing brace."
* commit '
ce2594832593dbf0d9d03f83054cabc9429261fa':
Added missing brace.
Nick Kralevich [Sat, 5 Jul 2014 17:03:45 +0000 (17:03 +0000)]
am
77491ac0: Merge "Correct typo in doc comment"
* commit '
77491ac00c18cd81328a3942c78a64436be65618':
Correct typo in doc comment
Nick Kralevich [Sat, 5 Jul 2014 16:59:56 +0000 (16:59 +0000)]
am
a2e4ce2b: Merge "Fix typo - issue 56671"
* commit '
a2e4ce2b7cab301f8bde5e4747be5dd85e899a63':
Fix typo - issue 56671
Nick Kralevich [Sat, 5 Jul 2014 16:59:51 +0000 (16:59 +0000)]
am
8b333467: Merge "fix trivial typo: s/meansure/measure"
* commit '
8b333467fea995d9cec72dddfcba8fa19363ee32':
fix trivial typo: s/meansure/measure
Nick Kralevich [Sat, 5 Jul 2014 16:56:47 +0000 (16:56 +0000)]
am
d92ab153: am
a6336747: Merge "Fix a copy/paste typo in ViewPropertyAnimator"
* commit '
d92ab153a3a33dcd1304661a9929112ab0b40d5a':
Fix a copy/paste typo in ViewPropertyAnimator
Nick Kralevich [Sat, 5 Jul 2014 16:52:11 +0000 (16:52 +0000)]
am
a6336747: Merge "Fix a copy/paste typo in ViewPropertyAnimator"
* commit '
a6336747a42fa5b64f82b7fe57ddf614d1fda9b2':
Fix a copy/paste typo in ViewPropertyAnimator
Nick Kralevich [Sat, 5 Jul 2014 16:51:45 +0000 (16:51 +0000)]
am
3b4c2c98: am
63af727b: Merge "Fix Issue 59989"
* commit '
3b4c2c982ef4ac681929678288ce042e4c0a5be6':
Fix Issue 59989
Nick Kralevich [Sat, 5 Jul 2014 16:51:38 +0000 (16:51 +0000)]
am
23219098: am
b70888d4: Merge "Fix a typo in a javadoc comment"
* commit '
23219098a6d623cf1825d8fd9a8d200cdc06aab9':
Fix a typo in a javadoc comment
Nick Kralevich [Sat, 5 Jul 2014 16:51:32 +0000 (16:51 +0000)]
am
dbb32da8: am
c9eff23b: Merge "Fix typo in DevicePolicyManager documentation"
* commit '
dbb32da844cf8ed65d0b5005276a86aad7c81853':
Fix typo in DevicePolicyManager documentation
Nick Kralevich [Sat, 5 Jul 2014 16:45:36 +0000 (16:45 +0000)]
am
63af727b: Merge "Fix Issue 59989"
* commit '
63af727b4b2e05ca18f1d9f5c8b4e87a6bfd5601':
Fix Issue 59989
Nick Kralevich [Sat, 5 Jul 2014 16:45:31 +0000 (16:45 +0000)]
am
b70888d4: Merge "Fix a typo in a javadoc comment"
* commit '
b70888d45573c015fbb9d584df575bf78f5e9684':
Fix a typo in a javadoc comment
Nick Kralevich [Sat, 5 Jul 2014 16:45:26 +0000 (16:45 +0000)]
am
c9eff23b: Merge "Fix typo in DevicePolicyManager documentation"
* commit '
c9eff23b443f26fb8c4873a6ecb61eded0564163':
Fix typo in DevicePolicyManager documentation
Nick Kralevich [Sat, 5 Jul 2014 16:40:59 +0000 (16:40 +0000)]
am
58005ec5: am
3b345a6f: Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2""
* commit '
58005ec545fd011418b6400a3b377fea6928c933':
Fix javadoc typo in Message.java: "arg1" -> "arg2"
Nick Kralevich [Sat, 5 Jul 2014 16:35:13 +0000 (16:35 +0000)]
am
3b345a6f: Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2""
* commit '
3b345a6f9103c1677a696b4770cc318df45cdcaa':
Fix javadoc typo in Message.java: "arg1" -> "arg2"
Nick Kralevich [Sat, 5 Jul 2014 16:27:14 +0000 (16:27 +0000)]
am
aa4ff2ef: am
eb822cec: Merge "Typo fix in permission string"
* commit '
aa4ff2efecb1aa03b6a6843bf8a4c19b885db4fc':
Typo fix in permission string
Nick Kralevich [Sat, 5 Jul 2014 16:22:17 +0000 (16:22 +0000)]
am
eb822cec: Merge "Typo fix in permission string"
* commit '
eb822cecdb128cb0a00f361b87b8378d5664a458':
Typo fix in permission string
Baligh Uddin [Sun, 6 Jul 2014 18:18:46 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Jul 2014 21:00:41 +0000 (14:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2898d53a3f6bf4fc920fa8c3bc122d00aa879d18
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:15:48 +0000 (18:15 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Jul 2014 21:10:06 +0000 (14:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie1868681bbc06d89a0695863e9146cd2ee85a5de
Auto-generated-cl: translation import
Narayan Kamath [Fri, 4 Jul 2014 09:23:55 +0000 (09:23 +0000)]
am
29a9d27d: am
358a3f71: Merge "fix AudioTrack and AudioRecord JNI"
* commit '
29a9d27d3c9224a7709a41096d7a958c8177ac19':
fix AudioTrack and AudioRecord JNI
Narayan Kamath [Fri, 4 Jul 2014 09:22:57 +0000 (09:22 +0000)]
am
5ae312fb: am
759e0d6a: Merge "Fix LocalePicker locale filtering."
* commit '
5ae312fb5b601d2c60e197f94c6a292700776140':
Fix LocalePicker locale filtering.
Narayan Kamath [Fri, 4 Jul 2014 08:49:02 +0000 (08:49 +0000)]
am
358a3f71: Merge "fix AudioTrack and AudioRecord JNI"
* commit '
358a3f716850e96716b766c63d50d3425a4c9ed7':
fix AudioTrack and AudioRecord JNI
Narayan Kamath [Fri, 4 Jul 2014 08:48:58 +0000 (08:48 +0000)]
am
759e0d6a: Merge "Fix LocalePicker locale filtering."
* commit '
759e0d6a7a258dbc34a38a7db320827eb9144487':
Fix LocalePicker locale filtering.
Narayan Kamath [Fri, 4 Jul 2014 08:23:08 +0000 (08:23 +0000)]
Merge "Fix LocalePicker locale filtering."
Narayan Kamath [Thu, 3 Jul 2014 12:26:07 +0000 (13:26 +0100)]
Fix LocalePicker locale filtering.
This was broken by commit
b27c137087ee92674 which
removed a badly phrased check. Prior to that commit,
there was a check that excluded locales whose toString()
length was not 5.
This change reinstates that check in a less roundabout
way, by excluding BCP-47 tags that don't have a country
subtag.
bug:
16038949
Change-Id: Ic24b1df87b2e2ce47d9ae04c7759088721f27b4f
Brian Duff [Thu, 3 Jul 2014 09:43:56 +0000 (09:43 +0000)]
am
c542745e: am
a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc."
* commit '
c542745e23fe9d2e71c1f607d66f5570f585133d':
Fix a typo in NumberPicker javadoc.
Brian Duff [Thu, 3 Jul 2014 06:45:04 +0000 (06:45 +0000)]
am
a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc."
* commit '
a6e9dd3f9a2d966faf2d1710d2189127b968dc52':
Fix a typo in NumberPicker javadoc.
Nick Kralevich [Sat, 5 Jul 2014 17:05:08 +0000 (17:05 +0000)]
Merge "Fix typo in comment of FragmentTransaction"
Nick Kralevich [Sat, 5 Jul 2014 17:00:02 +0000 (17:00 +0000)]
Merge "Added missing brace."
Nick Kralevich [Sat, 5 Jul 2014 16:54:56 +0000 (16:54 +0000)]
Merge "Fix typo - issue 56671"
Nick Kralevich [Sat, 5 Jul 2014 16:53:17 +0000 (16:53 +0000)]
Merge "fix trivial typo: s/meansure/measure"
Nick Kralevich [Sat, 5 Jul 2014 16:40:50 +0000 (16:40 +0000)]
Merge "Fix typo in DevicePolicyManager documentation"
Nick Kralevich [Sat, 5 Jul 2014 16:18:31 +0000 (16:18 +0000)]
Merge "Typo fix in permission string"
Jason Sams [Wed, 2 Jul 2014 21:32:05 +0000 (14:32 -0700)]
Resolve conflicts with AOSP.
Change-Id: I2f1afdb83dcfc9078df5d3c2f13abacb6504d73d
Narayan Kamath [Fri, 4 Jul 2014 08:41:17 +0000 (08:41 +0000)]
Merge "fix AudioTrack and AudioRecord JNI"
Eric Laurent [Wed, 30 Apr 2014 18:59:21 +0000 (11:59 -0700)]
fix AudioTrack and AudioRecord JNI
AudioTrack and AudioRecord JNI should not cast
jshortArray to jbyteArray. This appeared to work with Dalvik
but causes data corruption with ART.
(cherry picked from commit
9d02848e902d04417df616354db3a18c03e639b7)
Change-Id: Ie36624d3ea06042373c64edced4b5e30b7b1ee86
Nick Kralevich [Sat, 5 Jul 2014 17:07:51 +0000 (17:07 +0000)]
Merge "Fix typo in the exception message."
Nick Kralevich [Sat, 5 Jul 2014 16:57:45 +0000 (16:57 +0000)]
Merge "Correct typo in doc comment"
Nick Kralevich [Sat, 5 Jul 2014 16:47:22 +0000 (16:47 +0000)]
Merge "Fix a copy/paste typo in ViewPropertyAnimator"
Nick Kralevich [Sat, 5 Jul 2014 16:43:58 +0000 (16:43 +0000)]
Merge "Fix Issue 59989"
Nick Kralevich [Sat, 5 Jul 2014 16:41:54 +0000 (16:41 +0000)]
Merge "Fix a typo in a javadoc comment"
Nick Kralevich [Sat, 5 Jul 2014 17:11:25 +0000 (17:11 +0000)]
Merge "Typo in method name: Clone"
Nick Kralevich [Sat, 5 Jul 2014 16:30:08 +0000 (16:30 +0000)]
Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2""
Brian Duff [Thu, 3 Jul 2014 06:05:07 +0000 (06:05 +0000)]
Merge "Fix a typo in NumberPicker javadoc."
Baligh Uddin [Sun, 6 Jul 2014 18:19:01 +0000 (18:19 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Sat, 5 Jul 2014 18:08:40 +0000 (11:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3e2eae5b30231f3dc719c231d51c35234ed9dd94
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:02:50 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Jul 2014 22:09:48 +0000 (15:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic88faf73641a8570560ffe751f0c5776290c75c3
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:00:38 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Jul 2014 22:25:24 +0000 (15:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1765b9912ea2356677a927edb34166ea5cab43d9
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:00:33 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Jul 2014 22:30:27 +0000 (15:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1fd2ea26acb4d0e1c46c887c94d25e0ea1407e81
Auto-generated-cl: translation import
OSDN Git Service
