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
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
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
Geoffrey Borggaard
078b28dde9
am 863b8839: am fc6bc201: Allow navigation to TrustedCredentials User Certs by intent.
...
* commit '863b8839c7685554b41f3143472a6f379fd29ad1':
2013-12-05 19:40:14 +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
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
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
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
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
3c29831e87
Import translations. DO NOT MERGE
...
Change-Id: I4082ee8a0e0fe74e5328bd304f44cab57d4f40cb
Auto-generated-cl: translation import
2013-12-04 13:28:51 -08:00
Amith Yamasani
5ae0b304a9
am ff0fad2a: am e10f8528: Merge "Fix switching running/cached apps with memory bar"
...
* commit 'ff0fad2a0623d29536653f5be13009358fa68fab':
Fix switching running/cached apps with memory bar
2013-12-04 21:09:02 +00:00
Amith Yamasani
1cbb539668
am 95dd34b4: am f67aa398: Merge "Wrong referring to the resource - id/android:id"
...
* commit '95dd34b4e4570b832b6ae3c028fc448365389298':
Wrong referring to the resource - id/android:id
2013-12-04 21:09:01 +00:00
Amith Yamasani
ff0fad2a06
am e10f8528: Merge "Fix switching running/cached apps with memory bar"
...
* commit 'e10f8528220fc4506ff6deee5c71ddab3da5e21d':
Fix switching running/cached apps with memory bar
2013-12-04 13:05:17 -08:00
Amith Yamasani
95dd34b4e4
am f67aa398: Merge "Wrong referring to the resource - id/android:id"
...
* commit 'f67aa3985d36cace1fbea2537bcdc97f8b6d81ef':
Wrong referring to the resource - id/android:id
2013-12-04 13:05:16 -08:00
Amith Yamasani
e10f852822
Merge "Fix switching running/cached apps with memory bar"
2013-12-04 19:17:33 +00:00
Amith Yamasani
f67aa3985d
Merge "Wrong referring to the resource - id/android:id"
2013-12-04 19:05:29 +00:00
Amith Yamasani
e6e80b195b
am ab747c87: am 3d6ca113: am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev
...
* commit 'ab747c87a94648cb703f797e4a206b9ef9042772':
Put fragment in specific activity's whitelist
2013-12-03 19:42:24 +00:00
Amith Yamasani
ab747c87a9
am 3d6ca113: am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev
...
* commit '3d6ca11349f0ff2b53f4058731da9e904db2c938':
Put fragment in specific activity's whitelist
2013-12-03 11:38:00 -08:00
Amith Yamasani
3d6ca11349
am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev
...
* commit '72a7afb0935264586c821062279d39d8338b1e3d':
Put fragment in specific activity's whitelist
2013-12-03 11:35:14 -08:00
