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
Dianne Hackborn
bcecc4a7f8
am b690af54: am f3796d0b: Merge "Improve process stats UI." into klp-dev
...
* commit 'b690af54dc0c5e82d15226c5a85be713bcd25db2':
2013-12-05 19:40:13 +00:00
Alan Viverette
418d1df727
am 85c37e78: am c0f79432: Merge "Update captioning settings to match final design" into klp-dev
...
* commit '85c37e78b5bb21788ce3edb42363e550895cd9fc':
2013-12-05 19:40:12 +00:00
Amith Yamasani
391e601ae2
am d04e36e6: am 2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev
...
* commit 'd04e36e6f2259747dac4c4a1fa0393f72dc078af':
2013-12-05 19:37:05 +00:00
Alan Viverette
a330af1327
Merge "Add preference for caption text opacity"
2013-12-05 19:33:52 +00:00
Amith Yamasani
962c7f874a
am 1eb6105f: am a42cacb3: Merge "Potential fix for Bug: 10241642" into klp-dev
...
* commit '1eb6105f25dcecde565f9d56e5c87feed7bd520d':
2013-12-05 19:33:28 +00:00
Dianne Hackborn
8c01ad1ec8
am cd20ebcc: am c6d658e3: Initial rough stab at a proc stats UI.
...
* commit 'cd20ebcc8c0261765fa8e6de57df3f72062c710e':
2013-12-05 19:33:06 +00:00
Alan Viverette
205cee4c1c
Add preference for caption text opacity
...
BUG: 11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
2013-12-05 11:27:40 -08:00
Baligh Uddin
8be6770c4e
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':
2013-12-05 19:21:36 +00:00
The Android Open Source Project
c3835eae23
am 8c1845a6: (-s ours) am 76cbd841: am f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit '8c1845a6d669b03c2827965042f2e47e49f2d6b1':
2013-12-05 19:21:35 +00:00
Baligh Uddin
bf3d3f8fd0
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':
2013-12-05 19:21:34 +00:00
Amith Yamasani
436e4fd49f
am 05e2459f: am 82f7c064: Merge "Developer option to force RTL layout direction" into klp-dev
...
* commit '05e2459fb85848b19362554a7ffeb2e9b50da720':
2013-12-05 19:21:33 +00:00
David Christie
7fcc1d733f
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 'aba6eb64633e7957afe036a5d7c506b9c059ec3e':
2013-12-05 19:21:32 +00:00
Svetoslav
0e001877d3
am 0427cb67: am 3f257c4d: Fix a crash in accessibiility settings.
...
* commit '0427cb67d1545d38859e6522905b4a78d82bacc7':
2013-12-05 19:21:31 +00:00
Lifu Tang
fb2b5cd951
am 098061c2: am 88afb32f: Displays a list of most recent location apps
...
* commit '098061c2022164e169ec40e6114b48dd5bfcaff2':
2013-12-05 19:21:30 +00:00
Lifu Tang
cd4126005d
am 7b449db2: am b14698ee: Merge "Finished the location settings"
...
* commit '7b449db21ecae05f95355544936bd840a89601c7':
2013-12-05 19:21:28 +00:00
Jason Monk
92d5dd36f4
am 49d6f604: am 71decb7b: Merge "Restriction pin changes."
...
* commit '49d6f604f1ce05d90c8bdf25330fe8eb3eb924c9':
2013-12-05 19:21:27 +00:00
Baligh Uddin
e9529fe6cd
am dfa45967: (-s ours) am 7494ff47: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'dfa4596778b39d07aa7f27145baedee31d17cd48':
2013-12-05 19:21:26 +00:00
Lance Jin-woong Chang
8c9a5f8d23
am 76cd835e: am e161f873: am 1f5e6639: (-s ours) am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev
...
* commit '76cd835e76d42ca60cea7ecdfa0d772a2f95ed6e':
Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
2013-12-05 02:45:37 +00:00
Lance Chang
c3dfca8e17
am 31507e29: am 6d039786: am 0ea2229b: (-s ours) am 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev
...
* commit '31507e290dcd20390c5fc25f1bd01a76772899e3':
Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181
2013-12-05 02:45:34 +00:00
Geoff Mendal
93e050ae1b
am 056a3ff6: (-s ours) am bc3c36da: (-s ours) am 65c2a285: (-s ours) am 3c29831e: (-s ours) Import translations. DO NOT MERGE
...
* commit '056a3ff6460d4a893fc9e1bc1ef17596f16c1d68':
Import translations. DO NOT MERGE
2013-12-05 02:45:06 +00:00
Lance Jin-woong Chang
76cd835e76
am e161f873: am 1f5e6639: (-s ours) am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev
...
* commit 'e161f8733e816ac83e5d6823d5e958372395e94b':
Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
2013-12-05 01:43:56 +00:00
Lance Jin-woong Chang
e161f8733e
am 1f5e6639: (-s ours) am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev
...
* commit '1f5e66392e4fa01d2686a06044a8f0edfda6310f':
Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
2013-12-04 17:40:17 -08:00
Lance Chang
31507e290d
am 6d039786: am 0ea2229b: (-s ours) am 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev
...
* commit '6d0397864a1933a869553f500fa09536bbcb3c52':
Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181
2013-12-05 01:31:51 +00:00
Lance Jin-woong Chang
1f5e66392e
am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev
...
* commit '5d65a47c395918d3f777d99747eb4f2e901566ee':
Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
2013-12-04 17:29:27 -08:00
Lance Chang
6d0397864a
am 0ea2229b: (-s ours) am 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev
...
* commit '0ea2229b4b39146ed41b99ca0542c73e5305d059':
Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181
2013-12-04 17:28:36 -08:00
Lance Jin-woong Chang
5d65a47c39
Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev
2013-12-05 01:27:46 +00:00
Alan Viverette
3858233f89
Merge "Remove extra fragment in captioning preferences"
2013-12-05 01:19:54 +00:00
Alan Viverette
4098dba253
Remove extra fragment in captioning preferences
...
BUG: 11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac
2013-12-04 17:19:24 -08:00
Lance Jin-woong Chang
0637c1f909
Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
...
This reverts commit 5796dad9a4
2013-12-05 00:59:51 +00:00
Lance Chang
0ea2229b4b
am 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev
...
* commit '071fbfd3f35c01fb1c4052614902dabe16af691f':
Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181
2013-12-04 16:49:45 -08:00
Lance Chang
071fbfd3f3
Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev
2013-12-05 00:47:16 +00:00
Geoff Mendal
056a3ff646
am bc3c36da: (-s ours) am 65c2a285: (-s ours) am 3c29831e: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bc3c36da789d828e77a9d8baa2211712fe077a47':
Import translations. DO NOT MERGE
2013-12-04 21:50:43 +00:00
Geoff Mendal
bc3c36da78
am 65c2a285: (-s ours) am 3c29831e: (-s ours) Import translations. DO NOT MERGE
...
* commit '65c2a2850526802c542ac5a1dee26eab41c33ec3':
Import translations. DO NOT MERGE
2013-12-04 13:45:17 -08:00
Geoff Mendal
65c2a28505
am 3c29831e: (-s ours) Import translations. DO NOT MERGE
...
* commit '3c29831e87bb131246e88aeb2b18d1fc11627e5d':
Import translations. DO NOT MERGE
2013-12-04 13:42:04 -08:00
Geoff Mendal
5ce341e206
Merge "Import translations. DO NOT MERGE"
2013-12-04 21:39:45 +00:00
