The Android Automerger
c877b0e834
merge in master-release history after reset to master
2013-12-10 07:51:33 -08:00
Alan Viverette
96118a4d53
Accessibility: filter touches to Enable button
...
To prevent tap-jacking, filter touches to the enable button if there is
another window obscuring the screen.
Bug: 11242907
Change-Id: I0228cd480faf8e7ebf70394d9bb60fa2e4138fb4
2013-12-09 19:08:36 -08:00
Baligh Uddin
38bd642e23
Remove deprecated locales
...
Bug:11340849
Change-Id: I991b4918581b47f38f32dcad0fe77aa9301414c0
2013-12-09 22:54:15 +00:00
Qiwen Zhao
76aa20fa31
DO NOT MERGE reset to goog/klp-volantis-dev
2013-12-09 14:21:29 -08:00
Baligh Uddin
b10c4427ce
am ebadadc8: (-s ours) am b69795b6: (-s ours) am c5e08935: (-s ours) am 233d666a: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ebadadc8a4db3764a2238e97605ce605d5b2a21e':
Import translations. DO NOT MERGE
2013-12-09 20:33:16 +00:00
Baligh Uddin
ebadadc8a4
am b69795b6: (-s ours) am c5e08935: (-s ours) am 233d666a: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b69795b6f6a7a33fe20c2e6b06ef4be454ccdf98':
Import translations. DO NOT MERGE
2013-12-09 20:17:15 +00:00
Baligh Uddin
b69795b6f6
am c5e08935: (-s ours) am 233d666a: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c5e0893521593aaa7dc7089eeaf4f14eac07dad7':
Import translations. DO NOT MERGE
2013-12-09 12:13:46 -08:00
Baligh Uddin
c5e0893521
am 233d666a: (-s ours) Import translations. DO NOT MERGE
...
* commit '233d666aee25e8a869fa923e1578ca4ff0a202e2':
Import translations. DO NOT MERGE
2013-12-09 12:10:52 -08:00
Baligh Uddin
fee406c3f9
Import translations. DO NOT MERGE
...
Change-Id: I3b193d0d03e33dc55b17f50086c7c0ef53853655
Auto-generated-cl: translation import
2013-12-09 11:53:08 -08:00
Baligh Uddin
233d666aee
Import translations. DO NOT MERGE
...
Change-Id: I6e55230f7b85d2e90578617e879802d6d40eb6d2
Auto-generated-cl: translation import
2013-12-09 11:47:45 -08:00
The Android Automerger
448f2c462c
merge in master-release history after reset to master
2013-12-09 07:51:54 -08:00
Qiwen Zhao
93858eaf1e
am f95cea5b: (-s ours) snap to klp-dev-plus-aosp 9cadf8b with history
...
* commit 'f95cea5b924c1903148571e0506f16a2f318d4ba':
2013-12-06 22:19:05 +00:00
Andres Morales
fd2b629335
Settings for NFC Unlock
...
Change-Id: Ifaa2717da6c364daa7af073e42fc8f6a097c14bb
2013-12-06 13:50:26 -08:00
Qiwen Zhao
f95cea5b92
snap to klp-dev-plus-aosp 9cadf8b with history
2013-12-06 13:47:17 -08:00
The Android Open Source Project
af462332cd
am 65245b94: am 9cadf8b1: am b5685487: Merge commit \'f9ca318a3d2aceaf5c9e54610073a9017442be9b\' into HEAD
...
* commit '65245b94f346add994acee060454561355c2d261':
2013-12-06 01:38:40 +00:00
The Android Open Source Project
65245b94f3
am 9cadf8b1: am b5685487: Merge commit \'f9ca318a3d2aceaf5c9e54610073a9017442be9b\' into HEAD
...
* commit '9cadf8b10dee1e4dae9decb4f14f8d11f569eaa4':
2013-12-06 01:33:54 +00:00
The Android Open Source Project
9cadf8b10d
am b5685487: Merge commit \'f9ca318a3d2aceaf5c9e54610073a9017442be9b\' into HEAD
...
* commit 'b568548747c9b137d7da05fcdbb84f157273b3db':
2013-12-05 17:25:39 -08:00
Maggie Benthall
b70d779211
am fef3abf0: (-s ours) am fa6faf95: am cd3eb97c: Merge "Fix bug when sharing to bluetooth." into klp-dev
...
* commit 'fef3abf0fe535b4596a899981539164ece24df2f':
2013-12-05 22:51:38 +00:00
Przemyslaw Szczepaniak
08fe7189d6
am 99c0fd82: (-s ours) am d92af47f: am 0e01f128: Fix for TTS settings crash.
...
* commit '99c0fd825ad45258e16edfbdca87e669160fd099':
2013-12-05 22:51:37 +00:00
Baligh Uddin
bc12786049
am 43480718: (-s ours) am 3b3a8b09: (-s ours) am 0782e629: (-s ours) am 508997ad: (-s ours) am 728da455: (-s ours) am 03ae9bf0: (-s ours) Import translations. DO NOT MERGE
...
* commit '43480718fd2e8ed747209885f276a20f4167eebe':
2013-12-05 22:51:36 +00:00
Baligh Uddin
3f4563a285
am 2c50d95a: (-s ours) am 965d7569: (-s ours) am fff94ce8: (-s ours) am 08f1d439: (-s ours) am 05404105: (-s ours) Import translations. DO NOT MERGE
...
* commit '2c50d95ab4f3f5c087f07f86b4b6badeb1fe653e':
2013-12-05 22:51:35 +00:00
Baligh Uddin
5f93b9822e
am 8568ad2d: (-s ours) am b142c946: (-s ours) am a45cd5a6: (-s ours) Import translations. DO NOT MERGE
...
* commit '8568ad2d7023193b7125ac16d7f78c8556c652bf':
2013-12-05 22:51:34 +00:00
Zhihai Xu
ff0ef22a41
am 779afdfc: (-s ours) am eb9cecd9: am 6ee5b450: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
...
* commit '779afdfc6c6141b43f5d98ae8410a6647cafb81f':
2013-12-05 22:45:27 +00:00
Dianne Hackborn
506526eecd
am 306d51f4: (-s ours) am 3c7fdfd9: am a582a051: Proc stats UI improvements.
...
* commit '306d51f4e6c682c9a9998787a34d2ae177c9e93e':
2013-12-05 22:45:26 +00:00
Martijn Coenen
6a7b31557f
am 67627fab: (-s ours) am 0aee1b15: am 53083ab2: Instantiate correct classes for tap&say settings.
...
* commit '67627fabb7bfa8920dfdfc0b043cbac38d29da2e':
2013-12-05 22:45:25 +00:00
Geoffrey Borggaard
4a1b9640b4
am 078b28dd: (-s ours) am 863b8839: am fc6bc201: Allow navigation to TrustedCredentials User Certs by intent.
...
* commit '078b28dde92f504fb7bc56a0c3dfed0d84f28e4c':
2013-12-05 22:45:24 +00:00
Dianne Hackborn
9302751288
am bcecc4a7: (-s ours) am b690af54: am f3796d0b: Merge "Improve process stats UI." into klp-dev
...
* commit 'bcecc4a7f89ba9951d41fb46dd0c63c078cd66c4':
2013-12-05 22:45:23 +00:00
Alan Viverette
046e61eb13
am 418d1df7: (-s ours) am 85c37e78: am c0f79432: Merge "Update captioning settings to match final design" into klp-dev
...
* commit '418d1df7272f6ed9c332d4683205306ebeb7c731':
2013-12-05 22:45:23 +00:00
Amith Yamasani
edd5e0fade
am 391e601a: (-s ours) am d04e36e6: am 2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev
...
* commit '391e601ae2d7900ef598eb7d4903bbdde545afb1':
2013-12-05 22:45:22 +00:00
Amith Yamasani
5309674d43
am 962c7f87: (-s ours) am 1eb6105f: am a42cacb3: Merge "Potential fix for Bug: 10241642" into klp-dev
...
* commit '962c7f874ac3eedf7d60bba0c559cea6240ab5ba':
2013-12-05 22:45:21 +00:00
Dianne Hackborn
2581ce0626
am 8c01ad1e: (-s ours) am cd20ebcc: am c6d658e3: Initial rough stab at a proc stats UI.
...
* commit '8c01ad1ec8d4d48f0cd47f5858e8d6299eb991d2':
2013-12-05 22:45:20 +00:00
Baligh Uddin
cf75af2f46
am 8be6770c: (-s ours) am 921a3144: (-s ours) am dcd15ee0: (-s ours) am 7256942b: (-s ours) am d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
...
* commit '8be6770c4edb11ea3784a193d37339251b06902b':
2013-12-05 22:45:19 +00:00
The Android Open Source Project
e3d1af0bc9
am c3835eae: (-s ours) am 8c1845a6: (-s ours) am 76cbd841: am f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit 'c3835eae2336e3d42e28f0a8c712238e4fe12701':
2013-12-05 22:45:18 +00:00
Baligh Uddin
956ea0eea3
am bf3d3f8f: (-s ours) am c7891c6c: (-s ours) am ff2aed99: (-s ours) am b4d720f9: (-s ours) am 9a53339d: (-s ours) am e211fd11: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bf3d3f8fd015a834aaf54051cef1805f0b4a241f':
2013-12-05 22:45:17 +00:00
Amith Yamasani
3702e530d0
am 436e4fd4: (-s ours) am 05e2459f: am 82f7c064: Merge "Developer option to force RTL layout direction" into klp-dev
...
* commit '436e4fd49f4ec5728bb7e7b65e7b14c80b8f698c':
2013-12-05 22:45:16 +00:00
David Christie
9757e56b52
am 7fcc1d73: (-s ours) am aba6eb64: am b8fa4d9f: Merge "Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off." into klp-dev
...
* commit '7fcc1d733fe617ffbb463443058215c510024cae':
2013-12-05 22:45:15 +00:00
Svetoslav
3e8f71fe44
am 0e001877: (-s ours) am 0427cb67: am 3f257c4d: Fix a crash in accessibiility settings.
...
* commit '0e001877d3485d39d6f436c7ec4a6308d343fa93':
2013-12-05 22:45:14 +00:00
Lifu Tang
d9c1fd7548
am fb2b5cd9: (-s ours) am 098061c2: am 88afb32f: Displays a list of most recent location apps
...
* commit 'fb2b5cd951be02e8694d23b9dd9a832cd83bd960':
2013-12-05 22:45:13 +00:00
Lifu Tang
a83af4719c
am cd412600: (-s ours) am 7b449db2: am b14698ee: Merge "Finished the location settings"
...
* commit 'cd4126005dd7ef8808171c07df07ebb149170d1e':
2013-12-05 22:45:12 +00:00
Jason Monk
a383f09c96
am 92d5dd36: (-s ours) am 49d6f604: am 71decb7b: Merge "Restriction pin changes."
...
* commit '92d5dd36f4445ee386560582514934135c9f98bd':
2013-12-05 22:45:11 +00:00
Baligh Uddin
dfb6b35649
am e9529fe6: (-s ours) am dfa45967: (-s ours) am 7494ff47: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'e9529fe6cd7e0c8d3d6faad1b6db9c0d105ea702':
2013-12-05 22:45:10 +00:00
Maggie Benthall
fef3abf0fe
am fa6faf95: am cd3eb97c: Merge "Fix bug when sharing to bluetooth." into klp-dev
...
* commit 'fa6faf95bc70fee95093f7c7bd1b6a540a95fe03':
2013-12-05 21:30:53 +00:00
Przemyslaw Szczepaniak
99c0fd825a
am d92af47f: am 0e01f128: Fix for TTS settings crash.
...
* commit 'd92af47f9369f50edac2d5c36f78aee4997bbe8d':
2013-12-05 21:30:31 +00:00
Baligh Uddin
43480718fd
am 3b3a8b09: (-s ours) am 0782e629: (-s ours) am 508997ad: (-s ours) am 728da455: (-s ours) am 03ae9bf0: (-s ours) Import translations. DO NOT MERGE
...
* commit '3b3a8b097225a5667e4ad69ac3fb9e6e1bf89f9c':
2013-12-05 21:30:17 +00:00
Baligh Uddin
2c50d95ab4
am 965d7569: (-s ours) am fff94ce8: (-s ours) am 08f1d439: (-s ours) am 05404105: (-s ours) Import translations. DO NOT MERGE
...
* commit '965d756920d556d95178d48127ee14abcda85916':
2013-12-05 21:30:12 +00:00
Baligh Uddin
8568ad2d70
am b142c946: (-s ours) am a45cd5a6: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b142c9462f138de363ea1f6c42eaf5884ff2b645':
2013-12-05 21:30:10 +00:00
The Android Open Source Project
b568548747
Merge commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b' into HEAD
2013-12-05 12:38:23 -08:00
Zhihai Xu
779afdfc6c
am eb9cecd9: am 6ee5b450: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
...
* commit 'eb9cecd98b280c508b88d03ad788202ac0e35e53':
2013-12-05 19:43:01 +00:00
Dianne Hackborn
306d51f4e6
am 3c7fdfd9: am a582a051: Proc stats UI improvements.
...
* commit '3c7fdfd9e957ddb68fccba524a12fab84b469744':
2013-12-05 19:40:43 +00:00
Martijn Coenen
67627fabb7
am 0aee1b15: am 53083ab2: Instantiate correct classes for tap&say settings.
...
* commit '0aee1b150624f4b36e52e47fa97b8a18350d2df5':
2013-12-05 19:40:15 +00:00
