OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 200e21c5: (-s ours) am 57a85cee: (-s ours) am 77c61120: (-s ours) Import translati...
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

10 years agoam ca78b88e: (-s ours) am b84a800c: (-s ours) Merge "Import translations. DO NOT...
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

10 years agoam f6020778: (-s ours) am 562d8cc7: (-s ours) Merge "Import translations. DO NOT...
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

10 years agoam 037bcb40: (-s ours) am f617f4d0: (-s ours) 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

10 years agoam 57a85cee: (-s ours) am 77c61120: (-s ours) 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

10 years agoam b84a800c: (-s ours) Merge "Import translations. DO NOT MERGE" 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

10 years agoam 77c61120: (-s ours) 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

10 years agoam 562d8cc7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
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

10 years agoam f617f4d0: (-s ours) 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

10 years agoam 30a777ef: (-s ours) 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

10 years agoImport 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

10 years agoImport translations. DO NOT MERGE
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

10 years agoImport translations. DO NOT MERGE
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

10 years agoam 7228aa10: am 42b74e23: Merge "Typo in method name: Clone"
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

10 years agoam dbed61c8: am ca2df286: Merge "Fix typo in the exception message."
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.

10 years agoam d05a0743: am a347ece5: Merge "Fix typo in comment of FragmentTransaction"
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

10 years agoam 42b74e23: Merge "Typo in method name: Clone"
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

10 years agoam ca2df286: Merge "Fix typo in the exception message."
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.

10 years agoam a347ece5: Merge "Fix typo in comment of FragmentTransaction"
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

10 years agoam e1d8ee41: am ce259483: Merge "Added missing brace."
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.

10 years agoam 664ec0a6: am 77491ac0: Merge "Correct typo in doc comment"
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

10 years agoam f397f6f1: am a2e4ce2b: Merge "Fix typo - issue 56671"
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

10 years agoam c43f3eb6: am 8b333467: Merge "fix trivial typo: s/meansure/measure"
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

10 years agoam ce259483: Merge "Added missing brace."
Nick Kralevich [Sat, 5 Jul 2014 17:03:50 +0000 (17:03 +0000)]
am ce259483: Merge "Added missing brace."

* commit 'ce2594832593dbf0d9d03f83054cabc9429261fa':
  Added missing brace.

10 years agoam 77491ac0: Merge "Correct typo in doc comment"
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

10 years agoam a2e4ce2b: Merge "Fix typo - issue 56671"
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

10 years agoam 8b333467: Merge "fix trivial typo: s/meansure/measure"
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

10 years agoam d92ab153: am a6336747: Merge "Fix a copy/paste typo in ViewPropertyAnimator"
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

10 years agoam a6336747: Merge "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

10 years agoam 3b4c2c98: am 63af727b: Merge "Fix Issue 59989"
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

10 years agoam 23219098: am b70888d4: Merge "Fix a typo in a javadoc comment"
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

10 years agoam dbb32da8: am c9eff23b: Merge "Fix typo in DevicePolicyManager documentation"
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

10 years agoam 63af727b: Merge "Fix Issue 59989"
Nick Kralevich [Sat, 5 Jul 2014 16:45:36 +0000 (16:45 +0000)]
am 63af727b: Merge "Fix Issue 59989"

* commit '63af727b4b2e05ca18f1d9f5c8b4e87a6bfd5601':
  Fix Issue 59989

10 years agoam b70888d4: Merge "Fix a typo in a javadoc comment"
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

10 years agoam c9eff23b: Merge "Fix typo in DevicePolicyManager documentation"
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

10 years agoam 58005ec5: am 3b345a6f: Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2""
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"

10 years agoam 3b345a6f: Merge "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"

10 years agoam aa4ff2ef: am eb822cec: Merge "Typo fix in permission string"
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

10 years agoam eb822cec: Merge "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

10 years agoam 29a9d27d: am 358a3f71: Merge "fix AudioTrack and AudioRecord JNI"
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

10 years agoam 5ae312fb: am 759e0d6a: Merge "Fix LocalePicker locale filtering."
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.

10 years agoam 358a3f71: Merge "fix AudioTrack and AudioRecord JNI"
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

10 years agoam 759e0d6a: Merge "Fix LocalePicker locale filtering."
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.

10 years agoMerge "Fix LocalePicker locale filtering."
Narayan Kamath [Fri, 4 Jul 2014 08:23:08 +0000 (08:23 +0000)]
Merge "Fix LocalePicker locale filtering."

10 years agoFix 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

10 years agoam c542745e: am a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc."
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.

10 years agoam a6e9dd3f: Merge "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.

10 years agoMerge "Fix typo in comment of FragmentTransaction"
Nick Kralevich [Sat, 5 Jul 2014 17:05:08 +0000 (17:05 +0000)]
Merge "Fix typo in comment of FragmentTransaction"

10 years agoMerge "Added missing brace."
Nick Kralevich [Sat, 5 Jul 2014 17:00:02 +0000 (17:00 +0000)]
Merge "Added missing brace."

10 years agoMerge "Fix typo - issue 56671"
Nick Kralevich [Sat, 5 Jul 2014 16:54:56 +0000 (16:54 +0000)]
Merge "Fix typo - issue 56671"

10 years agoMerge "fix trivial typo: s/meansure/measure"
Nick Kralevich [Sat, 5 Jul 2014 16:53:17 +0000 (16:53 +0000)]
Merge "fix trivial typo: s/meansure/measure"

10 years agoMerge "Fix typo in DevicePolicyManager documentation"
Nick Kralevich [Sat, 5 Jul 2014 16:40:50 +0000 (16:40 +0000)]
Merge "Fix typo in DevicePolicyManager documentation"

10 years agoMerge "Typo fix in permission string"
Nick Kralevich [Sat, 5 Jul 2014 16:18:31 +0000 (16:18 +0000)]
Merge "Typo fix in permission string"

10 years agoResolve conflicts with AOSP.
Jason Sams [Wed, 2 Jul 2014 21:32:05 +0000 (14:32 -0700)]
Resolve conflicts with AOSP.

Change-Id: I2f1afdb83dcfc9078df5d3c2f13abacb6504d73d

10 years agoMerge "fix AudioTrack and AudioRecord JNI"
Narayan Kamath [Fri, 4 Jul 2014 08:41:17 +0000 (08:41 +0000)]
Merge "fix AudioTrack and AudioRecord JNI"

10 years agofix 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

10 years agoMerge "Fix typo in the exception message."
Nick Kralevich [Sat, 5 Jul 2014 17:07:51 +0000 (17:07 +0000)]
Merge "Fix typo in the exception message."

10 years agoMerge "Correct typo in doc comment"
Nick Kralevich [Sat, 5 Jul 2014 16:57:45 +0000 (16:57 +0000)]
Merge "Correct typo in doc comment"

10 years agoMerge "Fix a copy/paste typo in ViewPropertyAnimator"
Nick Kralevich [Sat, 5 Jul 2014 16:47:22 +0000 (16:47 +0000)]
Merge "Fix a copy/paste typo in ViewPropertyAnimator"

10 years agoMerge "Fix Issue 59989"
Nick Kralevich [Sat, 5 Jul 2014 16:43:58 +0000 (16:43 +0000)]
Merge "Fix Issue 59989"

10 years agoMerge "Fix a typo in a javadoc comment"
Nick Kralevich [Sat, 5 Jul 2014 16:41:54 +0000 (16:41 +0000)]
Merge "Fix a typo in a javadoc comment"

10 years agoMerge "Typo in method name: Clone"
Nick Kralevich [Sat, 5 Jul 2014 17:11:25 +0000 (17:11 +0000)]
Merge "Typo in method name: Clone"

10 years agoMerge "Fix javadoc typo in Message.java: "arg1" -> "arg2""
Nick Kralevich [Sat, 5 Jul 2014 16:30:08 +0000 (16:30 +0000)]
Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2""

10 years agoMerge "Fix a typo in NumberPicker javadoc."
Brian Duff [Thu, 3 Jul 2014 06:05:07 +0000 (06:05 +0000)]
Merge "Fix a typo in NumberPicker javadoc."

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:00:33 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev

10 years agoImport translations. DO NOT MERGE
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

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:02:45 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 22:12:04 +0000 (15:12 -0700)]
Import translations. DO NOT MERGE

Change-Id: I986812a228a7207cb203a4c0862d96dbd0f1e868
Auto-generated-cl: translation import

10 years agoam e1ef888e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 2 Jul 2014 15:08:10 +0000 (15:08 +0000)]
am e1ef888e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit 'e1ef888eac66c247710833746f7e8e2fc1f45c1b':
  Import translations. DO NOT MERGE

10 years agoam 48f89343: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 2 Jul 2014 15:08:06 +0000 (15:08 +0000)]
am 48f89343: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '48f89343d9abdaa81dcdbebd7a15b2b313d67aa7':
  Import translations. DO NOT MERGE

10 years agoam caaf4aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 2 Jul 2014 15:08:02 +0000 (15:08 +0000)]
am caaf4aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit 'caaf4aed05163df62365d351e592083ba95102cd':
  Import translations. DO NOT MERGE

10 years agoam e2840977: am 6e84f8c1: Merge "Fix native crashes when APKs can\'t be opened."
Narayan Kamath [Wed, 2 Jul 2014 12:18:45 +0000 (12:18 +0000)]
am e2840977: am 6e84f8c1: Merge "Fix native crashes when APKs can\'t be opened."

* commit 'e2840977d37e4d19425d448b54895536e43a2989':
  Fix native crashes when APKs can't be opened.

10 years agoam 6e84f8c1: Merge "Fix native crashes when APKs can\'t be opened."
Narayan Kamath [Wed, 2 Jul 2014 12:12:18 +0000 (12:12 +0000)]
am 6e84f8c1: Merge "Fix native crashes when APKs can\'t be opened."

* commit '6e84f8c1b9c72ab6e1eb189358292237dbe1efe8':
  Fix native crashes when APKs can't be opened.

10 years agoam 39e4f590: am f56399f6: Merge "Fall back to "tl" if "fil" is absent."
Narayan Kamath [Wed, 2 Jul 2014 10:09:45 +0000 (10:09 +0000)]
am 39e4f590: am f56399f6: Merge "Fall back to "tl" if "fil" is absent."

* commit '39e4f590787246ce35b995c0c0ce37b676a05e0c':
  Fall back to "tl" if "fil" is absent.

10 years agoam f56399f6: Merge "Fall back to "tl" if "fil" is absent."
Narayan Kamath [Wed, 2 Jul 2014 10:00:09 +0000 (10:00 +0000)]
am f56399f6: Merge "Fall back to "tl" if "fil" is absent."

* commit 'f56399f6ab492c8c32b7ff9a8deeb2547f17f6da':
  Fall back to "tl" if "fil" is absent.

10 years agoam 94171212: am 104da1e4: Merge "Fix broken assumptions in LocalePicker."
Narayan Kamath [Wed, 2 Jul 2014 09:54:22 +0000 (09:54 +0000)]
am 94171212: am 104da1e4: Merge "Fix broken assumptions in LocalePicker."

* commit '94171212431a45346e40fd97bbe72422e71f04be':
  Fix broken assumptions in LocalePicker.

10 years agoam d62196cf: am 3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."
Narayan Kamath [Wed, 2 Jul 2014 09:51:54 +0000 (09:51 +0000)]
am d62196cf: am 3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."

* commit 'd62196cfeffe5e4d725b5388fca57a18c154a44b':
  Remove bogus 2 char limit for locales and countries.

10 years agoam 104da1e4: Merge "Fix broken assumptions in LocalePicker."
Narayan Kamath [Wed, 2 Jul 2014 08:49:08 +0000 (08:49 +0000)]
am 104da1e4: Merge "Fix broken assumptions in LocalePicker."

* commit '104da1e495cbed81e7ebe66b80344bf916b02391':
  Fix broken assumptions in LocalePicker.

10 years agoam 3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."
Narayan Kamath [Wed, 2 Jul 2014 08:49:04 +0000 (08:49 +0000)]
am 3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."

* commit '3fa99ec77ee52164575375c7709923c94d9693a6':
  Remove bogus 2 char limit for locales and countries.

10 years agoam 9b3bfb10: docs: updated expandedtext_combo
Robert Ly [Wed, 2 Jul 2014 00:22:10 +0000 (00:22 +0000)]
am 9b3bfb10: docs: updated expandedtext_combo

* commit '9b3bfb1085770e558a31f9c4b1a6f9e6e34c8bc1':
  docs: updated expandedtext_combo

10 years agodocs: updated expandedtext_combo
Robert Ly [Wed, 2 Jul 2014 00:00:58 +0000 (17:00 -0700)]
docs: updated expandedtext_combo

Change-Id: Ida3f08560710bf9d32fefd6797830f2258fed3c6

10 years agoam f077e7b7: Merge "docs: add more notification images" into klp-modular-dev
Robert Ly [Wed, 2 Jul 2014 00:00:59 +0000 (00:00 +0000)]
am f077e7b7: Merge "docs: add more notification images" into klp-modular-dev

* commit 'f077e7b719419271b5fd666c22b7d19177d6c325':
  docs: add more notification images

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 2 Jul 2014 15:04:32 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 2 Jul 2014 15:04:35 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 2 Jul 2014 15:04:24 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoam 8922ddba: am a6e06889: Merge "Add profiler type options"
Brian Carlstrom [Tue, 1 Jul 2014 22:37:18 +0000 (22:37 +0000)]
am 8922ddba: am a6e06889: Merge "Add profiler type options"

* commit '8922ddbab1e394a59f957e8598fbbf88357e7838':
  Add profiler type options

10 years agoam a6e06889: Merge "Add profiler type options"
Brian Carlstrom [Tue, 1 Jul 2014 22:32:01 +0000 (22:32 +0000)]
am a6e06889: Merge "Add profiler type options"

* commit 'a6e06889fce7fbf2049f421daef02b8986736f77':
  Add profiler type options

10 years agoFix klp-modular-dev-plus-aosp build
Chris Craik [Tue, 1 Jul 2014 22:23:57 +0000 (15:23 -0700)]
Fix klp-modular-dev-plus-aosp build

Change-Id: I546dfef29b5875633de18f6a7e3f419a0d012faa

10 years agoam d172419e: am 9b1a7d45: Merge "Allow different SELinux policies for third party...
Nick Kralevich [Tue, 1 Jul 2014 21:16:14 +0000 (21:16 +0000)]
am d172419e: am 9b1a7d45: Merge "Allow different SELinux policies for third party apps."

* commit 'd172419e9a36f61af8c98d316ec2625e1f1304f6':
  Allow different SELinux policies for third party apps.

10 years agoam 9b1a7d45: Merge "Allow different SELinux policies for third party apps."
Nick Kralevich [Tue, 1 Jul 2014 21:13:12 +0000 (21:13 +0000)]
am 9b1a7d45: Merge "Allow different SELinux policies for third party apps."

* commit '9b1a7d4570dd692cf86c385dfcdf057ad966fa57':
  Allow different SELinux policies for third party apps.

10 years agoMerge "Allow different SELinux policies for third party apps."
Nick Kralevich [Tue, 1 Jul 2014 21:09:28 +0000 (21:09 +0000)]
Merge "Allow different SELinux policies for third party apps."

10 years agoAllow different SELinux policies for third party apps.
Robert Craig [Tue, 1 Jul 2014 20:53:11 +0000 (13:53 -0700)]
Allow different SELinux policies for third party apps.

Prior support forced all third party apps
to be resolved against the default stanza
of the mac_permissions.xml file when assigning
seinfo labels. This meant that all third party
apps, in effect, were untrusted regardless of
cert and therefore received the same selinux domain.
This also had the unfortunate side effect of forcing
certain third party apps into the wrong domains
because of shared userid requests among apps.

This patch removes that restriction and instead
allows all apps, regardless of location, to be
matched against the full mac_permissions.xml
policy file. This then allows all apps signed
with known good certs to receive the same selinux
domains of other apps with whom they share trust.

Change-Id: Iba569c046135c0e81140faf6296c5da26a243037
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Jul 2014 18:22:35 +0000 (11:22 -0700)]
Import translations. DO NOT MERGE

Change-Id: I006181afb024c03d268793fe4a8f547d9ee82d6b
Auto-generated-cl: translation import

10 years agoam 899c15ef: am db816cef: Merge "Make sure we clean up"
Marco Nelissen [Tue, 1 Jul 2014 18:21:41 +0000 (18:21 +0000)]
am 899c15ef: am db816cef: Merge "Make sure we clean up"

* commit '899c15ef2053f0cebfeda90b5211e80310e6f278':
  Make sure we clean up

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Jul 2014 18:15:32 +0000 (11:15 -0700)]
Import translations. DO NOT MERGE

Change-Id: I71e375bba32fd94ba872c7f5f35f338470a53524
Auto-generated-cl: translation import

10 years agoam db816cef: Merge "Make sure we clean up"
Marco Nelissen [Tue, 1 Jul 2014 18:15:28 +0000 (18:15 +0000)]
am db816cef: Merge "Make sure we clean up"

* commit 'db816cef0dd1f1988fbcf3c70a66f9c4acf73358':
  Make sure we clean up

10 years agoam b9246ef5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Tue, 1 Jul 2014 18:14:47 +0000 (18:14 +0000)]
am b9246ef5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit 'b9246ef52c7f8ea7c4888c0f45005a49792a8614':
  Import translations. DO NOT MERGE

10 years agoam 9846e4c6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Tue, 1 Jul 2014 18:14:40 +0000 (18:14 +0000)]
am 9846e4c6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '9846e4c676e9b1b656081bab3f9cb304f8cc3cdf':
  Import translations. DO NOT MERGE

10 years agoam 4a4fa0a3: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Jul 2014 18:14:36 +0000 (18:14 +0000)]
am 4a4fa0a3: (-s ours) Import translations. DO NOT MERGE

* commit '4a4fa0a30a4d53816fcb56545054d624f3243cb6':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Jul 2014 18:14:28 +0000 (11:14 -0700)]
Import translations. DO NOT MERGE

Change-Id: I827912aaef1d4a9bd0d38cdcbc24143d91704b56
Auto-generated-cl: translation import