Bill Yi
a3860afcb5
Merge commit '36a1bbe89025341987df0e380982cfbb4d09fe30' into HEAD
2014-04-29 11:34:27 -07:00
Elliott Hughes
4c94185028
Merge "Track MutableBoolean's new package."
2014-04-24 23:52:13 +00:00
Elliott Hughes
309004706c
Track MutableBoolean's new package.
...
Change-Id: I96df3fcbc3b94186a36617dfc1df5b195880be13
2014-04-23 18:04:40 -07:00
Wink Saville
242184ca23
Merge "Allow tablets to send SMS if enabled in device overlays (1/2)"
2014-04-16 20:21:57 +00:00
Baligh Uddin
36a1bbe890
am b86dff84: (-s ours) am da4a6a53: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b86dff8480e486847148f9651bc830b762d307ee':
Import translations. DO NOT MERGE
2014-03-25 17:02:01 +00:00
Baligh Uddin
b86dff8480
am da4a6a53: (-s ours) Import translations. DO NOT MERGE
...
* commit 'da4a6a53d48d3ba0ae0a7d6ea3cdfe2a26deb38a':
Import translations. DO NOT MERGE
2014-03-25 16:54:48 +00:00
Baligh Uddin
da4a6a53d4
Import translations. DO NOT MERGE
...
Change-Id: Ifc3cdc5dd618ef6c452303597b5abc791e0bf5af
Auto-generated-cl: translation import
2014-03-24 12:59:14 -07:00
Baligh Uddin
d274a6cfa2
am 2e71c1df: (-s ours) am 947e8995: (-s ours) Import translations. DO NOT MERGE
...
* commit '2e71c1df7cc52badeab52053bfa4c7a7f5b83cc8':
Import translations. DO NOT MERGE
2014-03-20 19:04:14 +00:00
Baligh Uddin
2e71c1df7c
am 947e8995: (-s ours) Import translations. DO NOT MERGE
...
* commit '947e8995856a66d05bfb614edf00dd5edfecc4ba':
Import translations. DO NOT MERGE
2014-03-20 18:41:54 +00:00
Baligh Uddin
947e899585
Import translations. DO NOT MERGE
...
Change-Id: I4fe915d0452b637fc646265dca39732877a12444
Auto-generated-cl: translation import
2014-03-19 13:10:41 -07:00
Geoff Mendal
f6eceb2c79
am c8131cb9: (-s ours) am e8de72e5: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c8131cb90e92b08cbfdc99690a5b5fa6a5e9cc48':
Import translations. DO NOT MERGE
2014-03-17 20:43:48 +00:00
Geoff Mendal
c8131cb90e
am e8de72e5: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e8de72e53ae22a9e373b8c65c8f57c14bf4a81eb':
Import translations. DO NOT MERGE
2014-03-17 20:34:20 +00:00
Geoff Mendal
e8de72e53a
Import translations. DO NOT MERGE
...
Change-Id: I85a8b58b4ced6be66f751e4315f5b039e0378355
Auto-generated-cl: translation import
2014-03-17 12:42:54 -07:00
David Braun
6e7db71959
am 63ac6a06: am edcb923d: Add string parameter order to default SMS dialog text
...
* commit '63ac6a06efd39078b3fc066896fc7ea003ab34ce':
Add string parameter order to default SMS dialog text
2014-03-14 04:12:47 +00:00
Baligh Uddin
da5cd9f430
am 25503480: (-s ours) am 7c35c10e: (-s ours) Import translations. DO NOT MERGE
...
* commit '255034803c3301cbf93ce64a2740af2abe8dc1f9':
Import translations. DO NOT MERGE
2014-03-14 04:12:35 +00:00
Przemyslaw Szczepaniak
38aeec0ad8
am 6829c48c: Merge "Fix F/C in TTS settings"
...
* commit '6829c48c36fceebb46989f8ee25c369fa5f7adeb':
Fix F/C in TTS settings
2014-03-13 23:18:44 +00:00
David Braun
63ac6a06ef
am edcb923d: Add string parameter order to default SMS dialog text
...
* commit 'edcb923df6f9e690fd16b0e643c6ba3da5e9264c':
Add string parameter order to default SMS dialog text
2014-03-13 18:30:11 +00:00
David Braun
edcb923df6
Add string parameter order to default SMS dialog text
...
Bug: 13433191 cs - Android - Other: Swapped placeholders in Hangouts confirmation message, reverse m
Change-Id: I8d00c58e5000b3851304d48c4681f9ebe2eebec8
2014-03-13 11:20:48 -07:00
Baligh Uddin
255034803c
am 7c35c10e: (-s ours) Import translations. DO NOT MERGE
...
* commit '7c35c10ebcf53a25d2c9c5cf37c25b1d5b553d1c':
Import translations. DO NOT MERGE
2014-03-13 16:40:31 +00:00
Przemyslaw Szczepaniak
6829c48c36
Merge "Fix F/C in TTS settings"
2014-03-13 15:26:49 +00:00
Shuhrat Dehkanov
f365216391
Fix F/C in TTS settings
...
This is an attempt to fix uncaught MissingResourceException
that would be thrown if default language of selected engine is
set to a locale that has no 3-letter country/language code.
Please see https://code.google.com/p/android/issues/detail?id=63122
Change-Id: Iccb2a55f5f7a97819310fd888559650fe7febe4a
Signed-off-by: Shuhrat Dehkanov <k@efir.uz >
2014-03-13 12:06:17 +09:00
Narayan Kamath
5877242019
am c776bbb1: Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."""
...
* commit 'c776bbb1562b844297260790fd1a50382396a3f9':
Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
2014-03-13 01:55:25 +00:00
Baligh Uddin
14cc7647cb
am 846f036e: (-s ours) am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '846f036ef15a2bea6c522e5b75b351b28c29953c':
Import translations. DO NOT MERGE
2014-03-12 20:40:19 +00:00
Baligh Uddin
7c35c10ebc
Import translations. DO NOT MERGE
...
Change-Id: Ide5d8c50abddb80d6e820777804ed8f0a2a93327
Auto-generated-cl: translation import
2014-03-12 12:02:29 -07:00
Alan Viverette
23d01e0b4b
am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
...
* commit '0100a310d8184baf9576925d160f8af09aa93b10':
DO NOT MERGE Add preference for caption text opacity
2014-03-11 23:05:19 +00:00
Alan Viverette
451994bf10
am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
...
* commit 'a74da813ec622822c8bb8b4524439c81e8b90dfa':
DO NOT MERGE Remove extra fragment in captioning preferences
2014-03-11 23:05:13 +00:00
Matthew Xie
4f9fa80d37
am 85fb88ee: Merge "HTML injection fix for bluetooth pairing, issue 65946"
...
* commit '85fb88ee10c6bb901d30e50038b4a86252ff8c68':
HTML injection fix for bluetooth pairing, issue 65946
2014-03-11 18:16:34 +00:00
Narayan Kamath
ed44913789
am 7f1c81b7: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
...
* commit '7f1c81b7b58a6a938494ed8f06d9fcf915226ba1':
Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
2014-03-11 18:16:11 +00:00
Narayan Kamath
01723221ff
am 14b0da74: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED."
...
* commit '14b0da749c73c1e0201adee1b398a1955b7d624e':
Set 24 hour pref. with ACTION_TIME_CHANGED.
2014-03-11 18:16:09 +00:00
Baligh Uddin
846f036ef1
am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
...
* commit '14b82fd73f59f51dffee9562057ab747f12134d3':
Import translations. DO NOT MERGE
2014-03-11 17:41:25 +00:00
Baligh Uddin
14b82fd73f
Merge "Import translations. DO NOT MERGE" into klp-dev
2014-03-11 17:37:53 +00:00
Narayan Kamath
c776bbb156
Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."""
2014-03-11 15:07:14 +00:00
Narayan Kamath
0a2bc1cc76
Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
...
This reverts commit 9ebc27c73e .
Change-Id: Id440bd004fee696472aeec9eefa5732755b19627
2014-03-11 13:05:37 +00:00
Alan Viverette
0100a310d8
am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
...
* commit '8840aa4c406bf08bba186cf9e674033bd1b9a4c1':
DO NOT MERGE Add preference for caption text opacity
2014-03-11 02:15:28 +00:00
Alan Viverette
a74da813ec
am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
...
* commit 'd43d5becb359cfdd5e30f691724739ab216011f0':
DO NOT MERGE Remove extra fragment in captioning preferences
2014-03-11 02:15:27 +00:00
Alan Viverette
8840aa4c40
Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
2014-03-11 02:11:52 +00:00
Alan Viverette
d43d5becb3
Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
2014-03-11 02:11:41 +00:00
Matthew Xie
d71a7ffd33
am 0223f9c5: Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change"
...
* commit '0223f9c5ddfdbcd2c759d1b0cf289844ca0438c0':
Bluetooth: GAP: Cancel the pairing notification on bond state change
2014-03-11 00:38:26 +00:00
Baligh Uddin
f1b94b2f67
Import translations. DO NOT MERGE
...
Change-Id: I7cdee6a82eff27c06e0b0039a695d28de2339011
Auto-generated-cl: translation import
2014-03-10 15:28:38 -07:00
Wei Wang
5632e40e13
am a8e634ca: am 104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
...
* commit 'a8e634ca5367dde80873a0b7643e27284db56336':
DO NOT MERGE Change bluetooth off display message.
2014-03-08 06:24:57 +00:00
Wei Wang
a8e634ca53
am 104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
...
* commit '104eea0b97c63b97040dc26ddf3635257e1b19a2':
DO NOT MERGE Change bluetooth off display message.
2014-03-08 02:02:19 +00:00
Wei Wang
104eea0b97
Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
2014-03-08 02:00:37 +00:00
Jeff Sharkey
748d3964ec
am 14136c7c: Merge "Settings: Fix the memory leak in Settings"
...
* commit '14136c7cdfee7525a97cfee6eec038994668b6a5':
Settings: Fix the memory leak in Settings
2014-03-08 01:51:49 +00:00
Alan Viverette
00f221dc9e
DO NOT MERGE Add preference for caption text opacity
...
BUG: 11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
2014-03-07 14:06:29 -08:00
Alan Viverette
af28facb6f
DO NOT MERGE Remove extra fragment in captioning preferences
...
BUG: 11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac
2014-03-07 14:06:07 -08:00
Rob Fletcher
449ac3f62f
am 04f36983: am 549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
...
* commit '04f3698345f804848ea7f03c6022dbdb0d8ac28d':
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
2014-03-07 18:30:47 +00:00
Jeff Sharkey
26f5c10684
am 1f37bff7: Merge "Total and available fields missing in Settings storage menu"
...
* commit '1f37bff7d26aeb3d1f16deb4368f8387e2d4530f':
Total and available fields missing in Settings storage menu
2014-03-07 02:24:13 +00:00
Jeff Sharkey
a97902ef14
am 5b4350f2: Merge "Fix memory leak in ManageApplication"
...
* commit '5b4350f22f81662436992504e711e462de7a790f':
Fix memory leak in ManageApplication
2014-03-07 02:24:12 +00:00
Brian Carlstrom
d475ff3bd3
am f2e9be9a: Merge "packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default"
...
* commit 'f2e9be9a4bb4c030c9bbcb29990e8b22bab809e4':
packages/apps/Settings: Rename persist.sys.dalvik.vm.lib to allow new default
2014-03-07 00:37:32 +00:00
Rob Fletcher
04f3698345
am 549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
...
* commit '549a39b49510dad27da588714f848dc891913239':
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
2014-03-06 21:59:31 +00:00