OSDN Git Service
Dianne Hackborn [Thu, 19 Dec 2013 22:51:47 +0000 (22:51 +0000)]
Merge "Update to follow BatteryStats."
Zhihai Xu [Thu, 19 Dec 2013 21:49:50 +0000 (21:49 +0000)]
Merge "BLuetooth Discoverable timer not correctly cleared"
Kim Schulz [Thu, 19 Dec 2013 09:03:11 +0000 (10:03 +0100)]
BLuetooth Discoverable timer not correctly cleared
Changing the discoverable timer from 2min to infinity before the 2min timer
has passed will not clear the 2min timer.
This fix handles this case.
Bug:
12220031
Change-Id: I8794eda353c74e46b09e15ee9a7a491658e7b5cd
Dianne Hackborn [Fri, 13 Dec 2013 00:17:49 +0000 (16:17 -0800)]
Update to follow BatteryStats.
Change data use to be based on packets instead of bytes.
Change-Id: I536dd2c2fc3fbeb12689e793f79e5fac984fe3af
Baligh Uddin [Thu, 19 Dec 2013 15:36:18 +0000 (15:36 +0000)]
am
0c70ceef: (-s ours) am
5f4deba1: (-s ours) am
fb793cb9: (-s ours) am
8c810a4e: (-s ours) am
7ba72721: (-s ours) Import translations. DO NOT MERGE
* commit '
0c70ceef84fd53887facc655a9c7088267e2935b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 15:34:33 +0000 (15:34 +0000)]
am
5f4deba1: (-s ours) am
fb793cb9: (-s ours) am
8c810a4e: (-s ours) am
7ba72721: (-s ours) Import translations. DO NOT MERGE
* commit '
5f4deba185e4ab2b3c121822add6cf0ec8ec5612':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 15:32:59 +0000 (15:32 +0000)]
am
fb793cb9: (-s ours) am
8c810a4e: (-s ours) am
7ba72721: (-s ours) Import translations. DO NOT MERGE
* commit '
fb793cb94e762c8c50072c529bba093777d3fa9f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 15:30:01 +0000 (07:30 -0800)]
am
8c810a4e: (-s ours) am
7ba72721: (-s ours) Import translations. DO NOT MERGE
* commit '
8c810a4e5dd0435f621e4f3f691bfc567d948ee0':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 15:28:03 +0000 (07:28 -0800)]
am
7ba72721: (-s ours) Import translations. DO NOT MERGE
* commit '
7ba72721134adeda10972f68fbcf74a491c6b11e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 06:15:35 +0000 (22:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie72bd5a59406450877a580e2c60c0c81f48ef603
Auto-generated-cl: translation import
Baligh Uddin [Thu, 19 Dec 2013 06:12:01 +0000 (22:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib169fe13c8487481f13d4a17b9f09bd04883f93e
Auto-generated-cl: translation import
Baligh Uddin [Tue, 17 Dec 2013 17:41:44 +0000 (17:41 +0000)]
am
665d1db2: (-s ours) am
d48a1386: (-s ours) am
379bb6ef: (-s ours) am
ee9a2cbc: (-s ours) am
1177cdec: (-s ours) Import translations. DO NOT MERGE
* commit '
665d1db296cf2cc9fb527ebe9a376ac2428ebb13':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 17 Dec 2013 17:40:19 +0000 (17:40 +0000)]
am
d48a1386: (-s ours) am
379bb6ef: (-s ours) am
ee9a2cbc: (-s ours) am
1177cdec: (-s ours) Import translations. DO NOT MERGE
* commit '
d48a138605e735175b519cb998e478a7aad0c60f':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 17 Dec 2013 17:38:44 +0000 (17:38 +0000)]
am
379bb6ef: (-s ours) am
ee9a2cbc: (-s ours) am
1177cdec: (-s ours) Import translations. DO NOT MERGE
* commit '
379bb6ef5a1140497c7cf3510faea1c705fe4583':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 17 Dec 2013 17:35:44 +0000 (09:35 -0800)]
am
ee9a2cbc: (-s ours) am
1177cdec: (-s ours) Import translations. DO NOT MERGE
* commit '
ee9a2cbcf3a12f65ddbc05507bf51ad161feee05':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 17 Dec 2013 17:33:32 +0000 (09:33 -0800)]
am
1177cdec: (-s ours) Import translations. DO NOT MERGE
* commit '
1177cdec4eeeacc787059a7843ade6571f54ac5f':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 17 Dec 2013 17:31:03 +0000 (17:31 +0000)]
Merge "Import translations. DO NOT MERGE"
Alan Viverette [Tue, 17 Dec 2013 01:20:41 +0000 (01:20 +0000)]
Merge "Update A11y service dialog for explicit create() before getButton()"
Baligh Uddin [Mon, 16 Dec 2013 20:47:52 +0000 (12:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iae6f3674d6838e5027505bde8a176c6d1add43df
Auto-generated-cl: translation import
Baligh Uddin [Mon, 16 Dec 2013 20:44:01 +0000 (12:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I41e0c190e9f01cfccff03435cebbf732b603751f
Auto-generated-cl: translation import
Andres Morales [Mon, 16 Dec 2013 19:27:29 +0000 (19:27 +0000)]
Merge "fix npe in SecuritySettings"
Andres Morales [Mon, 16 Dec 2013 19:23:14 +0000 (11:23 -0800)]
fix npe in SecuritySettings
Change-Id: Ib381cb7b985046fd4446e00ef67e3f2c12313796
Kenny Root [Fri, 13 Dec 2013 22:57:33 +0000 (22:57 +0000)]
am
3bf6ac0c: am
ead1bcd9: am
ef2f97c7: am
e14a5ef6: Merge "Use java.util.Objects instead of internal API"
* commit '
3bf6ac0c0ea1fe05f925d8df3db2e35f674dce4a':
Use java.util.Objects instead of internal API
Kenny Root [Fri, 13 Dec 2013 22:04:16 +0000 (22:04 +0000)]
am
ead1bcd9: am
ef2f97c7: am
e14a5ef6: Merge "Use java.util.Objects instead of internal API"
* commit '
ead1bcd9a23a811b25a73e663c556c590e649d82':
Use java.util.Objects instead of internal API
Kenny Root [Fri, 13 Dec 2013 22:01:13 +0000 (22:01 +0000)]
am
ef2f97c7: am
e14a5ef6: Merge "Use java.util.Objects instead of internal API"
* commit '
ef2f97c70e5942f390daf8e227eafa44ea675f09':
Use java.util.Objects instead of internal API
Kenny Root [Fri, 13 Dec 2013 21:58:59 +0000 (13:58 -0800)]
am
e14a5ef6: Merge "Use java.util.Objects instead of internal API"
* commit '
e14a5ef660ebc65cad53c1e108c99d9fd98a4696':
Use java.util.Objects instead of internal API
Kenny Root [Fri, 13 Dec 2013 21:51:29 +0000 (21:51 +0000)]
Merge "Use java.util.Objects instead of internal API"
Kenny Root [Fri, 13 Dec 2013 21:28:08 +0000 (13:28 -0800)]
Use java.util.Objects instead of internal API
Change-Id: Ib0d797b3e7f2e4f831f52832776b64c0973880b3
Andres Morales [Thu, 12 Dec 2013 17:38:26 +0000 (17:38 +0000)]
Merge "Settings for NFC Unlock"
Baligh Uddin [Thu, 12 Dec 2013 16:54:17 +0000 (16:54 +0000)]
am
061662cb: (-s ours) am
02dd4a20: (-s ours) am
f4f14efc: (-s ours) am
5fcebc78: (-s ours) am
879cc42f: (-s ours) Import translations. DO NOT MERGE
* commit '
061662cb1734b84709d019ac1d92ad418f3c966c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 16:51:25 +0000 (16:51 +0000)]
am
02dd4a20: (-s ours) am
f4f14efc: (-s ours) am
5fcebc78: (-s ours) am
879cc42f: (-s ours) Import translations. DO NOT MERGE
* commit '
02dd4a20e9a2ad1733e8cd52729f4c5683220f56':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 16:44:02 +0000 (16:44 +0000)]
am
f4f14efc: (-s ours) am
5fcebc78: (-s ours) am
879cc42f: (-s ours) Import translations. DO NOT MERGE
* commit '
f4f14efc79b82b7f99d311ae59ec394d60ae81c1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 16:40:48 +0000 (08:40 -0800)]
am
5fcebc78: (-s ours) am
879cc42f: (-s ours) Import translations. DO NOT MERGE
* commit '
5fcebc78b9f6a05ac661dba25acbd354981e9168':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 15:46:25 +0000 (07:46 -0800)]
am
879cc42f: (-s ours) Import translations. DO NOT MERGE
* commit '
879cc42fb33f717f985e4627355c7735c78f16b3':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 04:01:51 +0000 (20:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: I653a48c8fe5951d7987fc807befc343913ae11f3
Auto-generated-cl: translation import
Alan Viverette [Thu, 12 Dec 2013 00:07:00 +0000 (16:07 -0800)]
Update A11y service dialog for explicit create() before getButton()
Change-Id: Ic0fb7e2e7985dd3d3b65e40a639ab5fc0f5a8fd5
Vinit Deshapnde [Thu, 5 Dec 2013 02:28:45 +0000 (18:28 -0800)]
Move Wifi/P2p service components under services
Some methods need to be public, since frameworks/base complies before
frameworks/base/services; and services takes build dependency on base.
Similar issue exists with WifiEnterpriseConfig constants.
Bug:
9907308
Change-Id: Ied0e3dee0b25c939067dbc66867a9814b3b3b68e
Alan Viverette [Tue, 10 Dec 2013 21:58:44 +0000 (21:58 +0000)]
Merge "Accessibility: filter touches to Enable button"
Alan Viverette [Tue, 10 Dec 2013 21:54:02 +0000 (21:54 +0000)]
Merge "Remove dialog offering to download TalkBack"
Alan Viverette [Tue, 10 Dec 2013 21:19:13 +0000 (13:19 -0800)]
Remove dialog offering to download TalkBack
GMS devices are required to have at least one accessibility service
installed, and AOSP devices will not have Play Store, so this dialog
is obsolete.
BUG:
10429642
Change-Id: I08db466b305a4a73c35325656d143afdfcecf061
Qiwen Zhao [Tue, 10 Dec 2013 18:47:22 +0000 (18:47 +0000)]
am
76aa20fa: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
* commit '
76aa20fa31f6287dc2333f9627e85ffc6ccccf7a':
Alan Viverette [Tue, 10 Dec 2013 03:08:36 +0000 (19:08 -0800)]
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
Baligh Uddin [Mon, 9 Dec 2013 21:55:16 +0000 (13:55 -0800)]
Remove deprecated locales
Bug:
11340849
Change-Id: I991b4918581b47f38f32dcad0fe77aa9301414c0
Qiwen Zhao [Mon, 9 Dec 2013 22:21:29 +0000 (14:21 -0800)]
DO NOT MERGE reset to goog/klp-volantis-dev
Baligh Uddin [Mon, 9 Dec 2013 20:33:16 +0000 (20:33 +0000)]
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
Baligh Uddin [Mon, 9 Dec 2013 20:17:15 +0000 (20:17 +0000)]
am
b69795b6: (-s ours) am
c5e08935: (-s ours) am
233d666a: (-s ours) Import translations. DO NOT MERGE
* commit '
b69795b6f6a7a33fe20c2e6b06ef4be454ccdf98':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 20:13:46 +0000 (12:13 -0800)]
am
c5e08935: (-s ours) am
233d666a: (-s ours) Import translations. DO NOT MERGE
* commit '
c5e0893521593aaa7dc7089eeaf4f14eac07dad7':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 20:10:52 +0000 (12:10 -0800)]
am
233d666a: (-s ours) Import translations. DO NOT MERGE
* commit '
233d666aee25e8a869fa923e1578ca4ff0a202e2':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 19:53:08 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3b193d0d03e33dc55b17f50086c7c0ef53853655
Auto-generated-cl: translation import
Baligh Uddin [Mon, 9 Dec 2013 19:47:45 +0000 (11:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6e55230f7b85d2e90578617e879802d6d40eb6d2
Auto-generated-cl: translation import
Qiwen Zhao [Fri, 6 Dec 2013 22:19:05 +0000 (22:19 +0000)]
am
f95cea5b: (-s ours) snap to klp-dev-plus-aosp
9cadf8b with history
* commit '
f95cea5b924c1903148571e0506f16a2f318d4ba':
Andres Morales [Tue, 26 Nov 2013 01:26:13 +0000 (17:26 -0800)]
Settings for NFC Unlock
Change-Id: Ifaa2717da6c364daa7af073e42fc8f6a097c14bb
Qiwen Zhao [Fri, 6 Dec 2013 21:47:17 +0000 (13:47 -0800)]
snap to klp-dev-plus-aosp
9cadf8b with history
The Android Open Source Project [Fri, 6 Dec 2013 01:38:40 +0000 (01:38 +0000)]
The Android Open Source Project [Fri, 6 Dec 2013 01:33:54 +0000 (01:33 +0000)]
The Android Open Source Project [Fri, 6 Dec 2013 01:25:39 +0000 (17:25 -0800)]
Maggie Benthall [Thu, 5 Dec 2013 22:51:38 +0000 (22:51 +0000)]
am
fef3abf0: (-s ours) am
fa6faf95: am
cd3eb97c: Merge "Fix bug when sharing to bluetooth." into klp-dev
* commit '
fef3abf0fe535b4596a899981539164ece24df2f':
Przemyslaw Szczepaniak [Thu, 5 Dec 2013 22:51:37 +0000 (22:51 +0000)]
am
99c0fd82: (-s ours) am
d92af47f: am
0e01f128: Fix for TTS settings crash.
* commit '
99c0fd825ad45258e16edfbdca87e669160fd099':
Baligh Uddin [Thu, 5 Dec 2013 22:51:36 +0000 (22:51 +0000)]
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':
Baligh Uddin [Thu, 5 Dec 2013 22:51:35 +0000 (22:51 +0000)]
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':
Baligh Uddin [Thu, 5 Dec 2013 22:51:34 +0000 (22:51 +0000)]
am
8568ad2d: (-s ours) am
b142c946: (-s ours) am
a45cd5a6: (-s ours) Import translations. DO NOT MERGE
* commit '
8568ad2d7023193b7125ac16d7f78c8556c652bf':
Zhihai Xu [Thu, 5 Dec 2013 22:45:27 +0000 (22:45 +0000)]
am
779afdfc: (-s ours) am
eb9cecd9: am
6ee5b450: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
* commit '
779afdfc6c6141b43f5d98ae8410a6647cafb81f':
Dianne Hackborn [Thu, 5 Dec 2013 22:45:26 +0000 (22:45 +0000)]
am
306d51f4: (-s ours) am
3c7fdfd9: am
a582a051: Proc stats UI improvements.
* commit '
306d51f4e6c682c9a9998787a34d2ae177c9e93e':
Martijn Coenen [Thu, 5 Dec 2013 22:45:25 +0000 (22:45 +0000)]
am
67627fab: (-s ours) am
0aee1b15: am
53083ab2: Instantiate correct classes for tap&say settings.
* commit '
67627fabb7bfa8920dfdfc0b043cbac38d29da2e':
Geoffrey Borggaard [Thu, 5 Dec 2013 22:45:24 +0000 (22:45 +0000)]
am
078b28dd: (-s ours) am
863b8839: am
fc6bc201: Allow navigation to TrustedCredentials User Certs by intent.
* commit '
078b28dde92f504fb7bc56a0c3dfed0d84f28e4c':
Dianne Hackborn [Thu, 5 Dec 2013 22:45:23 +0000 (22:45 +0000)]
am
bcecc4a7: (-s ours) am
b690af54: am
f3796d0b: Merge "Improve process stats UI." into klp-dev
* commit '
bcecc4a7f89ba9951d41fb46dd0c63c078cd66c4':
Alan Viverette [Thu, 5 Dec 2013 22:45:23 +0000 (22:45 +0000)]
am
418d1df7: (-s ours) am
85c37e78: am
c0f79432: Merge "Update captioning settings to match final design" into klp-dev
* commit '
418d1df7272f6ed9c332d4683205306ebeb7c731':
Amith Yamasani [Thu, 5 Dec 2013 22:45:22 +0000 (22:45 +0000)]
am
391e601a: (-s ours) am
d04e36e6: am
2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev
* commit '
391e601ae2d7900ef598eb7d4903bbdde545afb1':
Amith Yamasani [Thu, 5 Dec 2013 22:45:21 +0000 (22:45 +0000)]
am
962c7f87: (-s ours) am
1eb6105f: am
a42cacb3: Merge "Potential fix for Bug:
10241642" into klp-dev
* commit '
962c7f874ac3eedf7d60bba0c559cea6240ab5ba':
Dianne Hackborn [Thu, 5 Dec 2013 22:45:20 +0000 (22:45 +0000)]
am
8c01ad1e: (-s ours) am
cd20ebcc: am
c6d658e3: Initial rough stab at a proc stats UI.
* commit '
8c01ad1ec8d4d48f0cd47f5858e8d6299eb991d2':
Baligh Uddin [Thu, 5 Dec 2013 22:45:19 +0000 (22:45 +0000)]
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':
The Android Open Source Project [Thu, 5 Dec 2013 22:45:18 +0000 (22:45 +0000)]
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':
Baligh Uddin [Thu, 5 Dec 2013 22:45:17 +0000 (22:45 +0000)]
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':
Amith Yamasani [Thu, 5 Dec 2013 22:45:16 +0000 (22:45 +0000)]
am
436e4fd4: (-s ours) am
05e2459f: am
82f7c064: Merge "Developer option to force RTL layout direction" into klp-dev
* commit '
436e4fd49f4ec5728bb7e7b65e7b14c80b8f698c':
David Christie [Thu, 5 Dec 2013 22:45:15 +0000 (22:45 +0000)]
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':
Svetoslav [Thu, 5 Dec 2013 22:45:14 +0000 (22:45 +0000)]
am
0e001877: (-s ours) am
0427cb67: am
3f257c4d: Fix a crash in accessibiility settings.
* commit '
0e001877d3485d39d6f436c7ec4a6308d343fa93':
Lifu Tang [Thu, 5 Dec 2013 22:45:13 +0000 (22:45 +0000)]
am
fb2b5cd9: (-s ours) am
098061c2: am
88afb32f: Displays a list of most recent location apps
* commit '
fb2b5cd951be02e8694d23b9dd9a832cd83bd960':
Lifu Tang [Thu, 5 Dec 2013 22:45:12 +0000 (22:45 +0000)]
am
cd412600: (-s ours) am
7b449db2: am
b14698ee: Merge "Finished the location settings"
* commit '
cd4126005dd7ef8808171c07df07ebb149170d1e':
Jason Monk [Thu, 5 Dec 2013 22:45:11 +0000 (22:45 +0000)]
am
92d5dd36: (-s ours) am
49d6f604: am
71decb7b: Merge "Restriction pin changes."
* commit '
92d5dd36f4445ee386560582514934135c9f98bd':
Baligh Uddin [Thu, 5 Dec 2013 22:45:10 +0000 (22:45 +0000)]
am
e9529fe6: (-s ours) am
dfa45967: (-s ours) am
7494ff47: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
e9529fe6cd7e0c8d3d6faad1b6db9c0d105ea702':
Maggie Benthall [Thu, 5 Dec 2013 21:30:53 +0000 (21:30 +0000)]
am
fa6faf95: am
cd3eb97c: Merge "Fix bug when sharing to bluetooth." into klp-dev
* commit '
fa6faf95bc70fee95093f7c7bd1b6a540a95fe03':
Przemyslaw Szczepaniak [Thu, 5 Dec 2013 21:30:31 +0000 (21:30 +0000)]
Baligh Uddin [Thu, 5 Dec 2013 21:30:17 +0000 (21:30 +0000)]
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':
Baligh Uddin [Thu, 5 Dec 2013 21:30:12 +0000 (21:30 +0000)]
am
965d7569: (-s ours) am
fff94ce8: (-s ours) am
08f1d439: (-s ours) am
05404105: (-s ours) Import translations. DO NOT MERGE
* commit '
965d756920d556d95178d48127ee14abcda85916':
Baligh Uddin [Thu, 5 Dec 2013 21:30:10 +0000 (21:30 +0000)]
am
b142c946: (-s ours) am
a45cd5a6: (-s ours) Import translations. DO NOT MERGE
* commit '
b142c9462f138de363ea1f6c42eaf5884ff2b645':
The Android Open Source Project [Thu, 5 Dec 2013 20:38:23 +0000 (12:38 -0800)]
Zhihai Xu [Thu, 5 Dec 2013 19:43:01 +0000 (19:43 +0000)]
am
eb9cecd9: am
6ee5b450: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
* commit '
eb9cecd98b280c508b88d03ad788202ac0e35e53':
Dianne Hackborn [Thu, 5 Dec 2013 19:40:43 +0000 (19:40 +0000)]
Martijn Coenen [Thu, 5 Dec 2013 19:40:15 +0000 (19:40 +0000)]
am
0aee1b15: am
53083ab2: Instantiate correct classes for tap&say settings.
* commit '
0aee1b150624f4b36e52e47fa97b8a18350d2df5':
Geoffrey Borggaard [Thu, 5 Dec 2013 19:40:14 +0000 (19:40 +0000)]
am
863b8839: am
fc6bc201: Allow navigation to TrustedCredentials User Certs by intent.
* commit '
863b8839c7685554b41f3143472a6f379fd29ad1':
Dianne Hackborn [Thu, 5 Dec 2013 19:40:13 +0000 (19:40 +0000)]
am
b690af54: am
f3796d0b: Merge "Improve process stats UI." into klp-dev
* commit '
b690af54dc0c5e82d15226c5a85be713bcd25db2':
Alan Viverette [Thu, 5 Dec 2013 19:40:12 +0000 (19:40 +0000)]
am
85c37e78: am
c0f79432: Merge "Update captioning settings to match final design" into klp-dev
* commit '
85c37e78b5bb21788ce3edb42363e550895cd9fc':
Amith Yamasani [Thu, 5 Dec 2013 19:37:05 +0000 (19:37 +0000)]
am
d04e36e6: am
2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev
* commit '
d04e36e6f2259747dac4c4a1fa0393f72dc078af':
Alan Viverette [Thu, 5 Dec 2013 19:33:52 +0000 (19:33 +0000)]
Merge "Add preference for caption text opacity"
Amith Yamasani [Thu, 5 Dec 2013 19:33:28 +0000 (19:33 +0000)]
am
1eb6105f: am
a42cacb3: Merge "Potential fix for Bug:
10241642" into klp-dev
* commit '
1eb6105f25dcecde565f9d56e5c87feed7bd520d':
Dianne Hackborn [Thu, 5 Dec 2013 19:33:06 +0000 (19:33 +0000)]
am
cd20ebcc: am
c6d658e3: Initial rough stab at a proc stats UI.
* commit '
cd20ebcc8c0261765fa8e6de57df3f72062c710e':
Alan Viverette [Thu, 5 Dec 2013 19:27:40 +0000 (11:27 -0800)]
Add preference for caption text opacity
BUG:
11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
Baligh Uddin [Thu, 5 Dec 2013 19:21:36 +0000 (19:21 +0000)]
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 '
921a3144a06496acfb06b512e443473141056304':
The Android Open Source Project [Thu, 5 Dec 2013 19:21:35 +0000 (19:21 +0000)]
am
8c1845a6: (-s ours) am
76cbd841: am
f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
8c1845a6d669b03c2827965042f2e47e49f2d6b1':
Baligh Uddin [Thu, 5 Dec 2013 19:21:34 +0000 (19:21 +0000)]
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 '
c7891c6c8d309710a4b948ad2084e43bcd7ebe5c':
OSDN Git Service
