git.osdn.net Git - android-x86/packages-apps-Settings.git/log

(root) / android-x86 / packages-apps-Settings.git / log

The Android Open Source Project [Fri, 6 Dec 2013 01:38:40 +0000 (01:38 +0000)]

am 65245b94: am 9cadf8b1: am b5685487: Merge commit \'f9ca318a3d2aceaf5c9e54610073a9017442be9b\' into HEAD

* commit '65245b94f346add994acee060454561355c2d261':

commit | commitdiff | tree

The Android Open Source Project [Fri, 6 Dec 2013 01:33:54 +0000 (01:33 +0000)]

am 9cadf8b1: am b5685487: Merge commit \'f9ca318a3d2aceaf5c9e54610073a9017442be9b\' into HEAD

* commit '9cadf8b10dee1e4dae9decb4f14f8d11f569eaa4':

commit | commitdiff | tree

The Android Open Source Project [Fri, 6 Dec 2013 01:25:39 +0000 (17:25 -0800)]

am b5685487: Merge commit \'f9ca318a3d2aceaf5c9e54610073a9017442be9b\' into HEAD

* commit 'b568548747c9b137d7da05fcdbb84f157273b3db':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Przemyslaw Szczepaniak [Thu, 5 Dec 2013 21:30:31 +0000 (21:30 +0000)]

am d92af47f: am 0e01f128: Fix for TTS settings crash.

* commit 'd92af47f9369f50edac2d5c36f78aee4997bbe8d':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

The Android Open Source Project [Thu, 5 Dec 2013 20:38:23 +0000 (12:38 -0800)]

Merge commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b' into HEAD

commit | commitdiff | tree

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':

commit | commitdiff | tree

Dianne Hackborn [Thu, 5 Dec 2013 19:40:43 +0000 (19:40 +0000)]

am 3c7fdfd9: am a582a051: Proc stats UI improvements.

* commit '3c7fdfd9e957ddb68fccba524a12fab84b469744':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Alan Viverette [Thu, 5 Dec 2013 19:33:52 +0000 (19:33 +0000)]

Merge "Add preference for caption text opacity"

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Alan Viverette [Thu, 5 Dec 2013 19:27:40 +0000 (11:27 -0800)]

Add preference for caption text opacity

BUG: 11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Amith Yamasani [Thu, 5 Dec 2013 19:21:33 +0000 (19:21 +0000)]

am 05e2459f: am 82f7c064: Merge "Developer option to force RTL layout direction" into klp-dev

* commit '05e2459fb85848b19362554a7ffeb2e9b50da720':

commit | commitdiff | tree

David Christie [Thu, 5 Dec 2013 19:21:32 +0000 (19:21 +0000)]

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':

commit | commitdiff | tree

Svetoslav [Thu, 5 Dec 2013 19:21:31 +0000 (19:21 +0000)]

am 0427cb67: am 3f257c4d: Fix a crash in accessibiility settings.

* commit '0427cb67d1545d38859e6522905b4a78d82bacc7':

commit | commitdiff | tree

Lifu Tang [Thu, 5 Dec 2013 19:21:30 +0000 (19:21 +0000)]

am 098061c2: am 88afb32f: Displays a list of most recent location apps

* commit '098061c2022164e169ec40e6114b48dd5bfcaff2':

commit | commitdiff | tree

Lifu Tang [Thu, 5 Dec 2013 19:21:28 +0000 (19:21 +0000)]

am 7b449db2: am b14698ee: Merge "Finished the location settings"

* commit '7b449db21ecae05f95355544936bd840a89601c7':

commit | commitdiff | tree

Jason Monk [Thu, 5 Dec 2013 19:21:27 +0000 (19:21 +0000)]

am 49d6f604: am 71decb7b: Merge "Restriction pin changes."

* commit '49d6f604f1ce05d90c8bdf25330fe8eb3eb924c9':

commit | commitdiff | tree

Baligh Uddin [Thu, 5 Dec 2013 19:21:26 +0000 (19:21 +0000)]

am dfa45967: (-s ours) am 7494ff47: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit 'dfa4596778b39d07aa7f27145baedee31d17cd48':

commit | commitdiff | tree

Lance Jin-woong Chang [Thu, 5 Dec 2013 02:45:37 +0000 (02:45 +0000)]

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"

commit | commitdiff | tree

Lance Chang [Thu, 5 Dec 2013 02:45:34 +0000 (02:45 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Thu, 5 Dec 2013 02:45:06 +0000 (02:45 +0000)]

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

commit | commitdiff | tree

Lance Jin-woong Chang [Thu, 5 Dec 2013 01:43:56 +0000 (01:43 +0000)]

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"

commit | commitdiff | tree

Lance Jin-woong Chang [Thu, 5 Dec 2013 01:40:17 +0000 (17:40 -0800)]

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"

commit | commitdiff | tree

Lance Chang [Thu, 5 Dec 2013 01:31:51 +0000 (01:31 +0000)]

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

commit | commitdiff | tree

Lance Jin-woong Chang [Thu, 5 Dec 2013 01:29:27 +0000 (17:29 -0800)]

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"

commit | commitdiff | tree

Lance Chang [Thu, 5 Dec 2013 01:28:36 +0000 (17:28 -0800)]

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

commit | commitdiff | tree

Lance Jin-woong Chang [Thu, 5 Dec 2013 01:27:43 +0000 (01:27 +0000)]

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 | commitdiff | tree

Alan Viverette [Thu, 5 Dec 2013 01:19:54 +0000 (01:19 +0000)]

Merge "Remove extra fragment in captioning preferences"

commit | commitdiff | tree

Alan Viverette [Thu, 5 Dec 2013 01:19:24 +0000 (17:19 -0800)]

Remove extra fragment in captioning preferences

BUG: 11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac

commit | commitdiff | tree

Lance Jin-woong Chang [Thu, 5 Dec 2013 00:59:51 +0000 (00:59 +0000)]

Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"

This reverts commit 5796dad9a41e9801878f2cf0feb76977da4b025b.

Change-Id: Ib9de134bef6328dac6aa5a4b6033c584fb672ab5

commit | commitdiff | tree

Lance Chang [Thu, 5 Dec 2013 00:49:45 +0000 (16:49 -0800)]

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

commit | commitdiff | tree

Lance Chang [Thu, 5 Dec 2013 00:47:14 +0000 (00:47 +0000)]

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 | commitdiff | tree

Geoff Mendal [Wed, 4 Dec 2013 21:50:43 +0000 (21:50 +0000)]

am bc3c36da: (-s ours) am 65c2a285: (-s ours) am 3c29831e: (-s ours) Import translations. DO NOT MERGE

* commit 'bc3c36da789d828e77a9d8baa2211712fe077a47':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 4 Dec 2013 21:45:17 +0000 (13:45 -0800)]

am 65c2a285: (-s ours) am 3c29831e: (-s ours) Import translations. DO NOT MERGE

* commit '65c2a2850526802c542ac5a1dee26eab41c33ec3':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 4 Dec 2013 21:42:04 +0000 (13:42 -0800)]

am 3c29831e: (-s ours) Import translations. DO NOT MERGE

* commit '3c29831e87bb131246e88aeb2b18d1fc11627e5d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 4 Dec 2013 21:39:45 +0000 (21:39 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Wed, 4 Dec 2013 21:33:47 +0000 (13:33 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ib2166418fe68c233b3015b1cab029729abcfcca3
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Wed, 4 Dec 2013 21:28:51 +0000 (13:28 -0800)]

Import translations. DO NOT MERGE

Change-Id: I4082ee8a0e0fe74e5328bd304f44cab57d4f40cb
Auto-generated-cl: translation import

commit | commitdiff | tree

Amith Yamasani [Wed, 4 Dec 2013 21:14:44 +0000 (21:14 +0000)]

am 5ae0b304: am ff0fad2a: am e10f8528: Merge "Fix switching running/cached apps with memory bar"

* commit '5ae0b304a9cda254239c5fdfd12a744bda191e2c':
Fix switching running/cached apps with memory bar

commit | commitdiff | tree

Amith Yamasani [Wed, 4 Dec 2013 21:14:43 +0000 (21:14 +0000)]

am 1cbb5396: am 95dd34b4: am f67aa398: Merge "Wrong referring to the resource - id/android:id"

* commit '1cbb539668cd5c16d3c428d6b1b91d7f3b4e9f72':
Wrong referring to the resource - id/android:id

commit | commitdiff | tree

Amith Yamasani [Wed, 4 Dec 2013 21:09:02 +0000 (21:09 +0000)]

am ff0fad2a: am e10f8528: Merge "Fix switching running/cached apps with memory bar"

* commit 'ff0fad2a0623d29536653f5be13009358fa68fab':
Fix switching running/cached apps with memory bar

commit | commitdiff | tree

Amith Yamasani [Wed, 4 Dec 2013 21:09:01 +0000 (21:09 +0000)]

am 95dd34b4: am f67aa398: Merge "Wrong referring to the resource - id/android:id"

* commit '95dd34b4e4570b832b6ae3c028fc448365389298':
Wrong referring to the resource - id/android:id

commit | commitdiff | tree

Amith Yamasani [Wed, 4 Dec 2013 21:05:17 +0000 (13:05 -0800)]

am e10f8528: Merge "Fix switching running/cached apps with memory bar"

* commit 'e10f8528220fc4506ff6deee5c71ddab3da5e21d':
Fix switching running/cached apps with memory bar

commit | commitdiff | tree

Amith Yamasani [Wed, 4 Dec 2013 21:05:16 +0000 (13:05 -0800)]

am f67aa398: Merge "Wrong referring to the resource - id/android:id"

* commit 'f67aa3985d36cace1fbea2537bcdc97f8b6d81ef':
Wrong referring to the resource - id/android:id

commit | commitdiff | tree

Amith Yamasani [Wed, 4 Dec 2013 19:17:33 +0000 (19:17 +0000)]

Merge "Fix switching running/cached apps with memory bar"

commit | commitdiff | tree

Amith Yamasani [Wed, 4 Dec 2013 19:05:29 +0000 (19:05 +0000)]

Merge "Wrong referring to the resource - id/android:id"

commit | commitdiff | tree

Amith Yamasani [Tue, 3 Dec 2013 19:45:49 +0000 (19:45 +0000)]

am e6e80b19: am ab747c87: am 3d6ca113: am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev

* commit 'e6e80b195b011c074241cbae4325f713190fa196':
Put fragment in specific activity's whitelist

commit | commitdiff | tree

Amith Yamasani [Tue, 3 Dec 2013 19:42:24 +0000 (19:42 +0000)]

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

commit | commitdiff | tree

Amith Yamasani [Tue, 3 Dec 2013 19:38:00 +0000 (11:38 -0800)]

am 3d6ca113: am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev

* commit '3d6ca11349f0ff2b53f4058731da9e904db2c938':
Put fragment in specific activity's whitelist

commit | commitdiff | tree

Amith Yamasani [Tue, 3 Dec 2013 19:35:14 +0000 (11:35 -0800)]

am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev

* commit '72a7afb0935264586c821062279d39d8338b1e3d':
Put fragment in specific activity's whitelist

commit | commitdiff | tree

Amith Yamasani [Tue, 3 Dec 2013 19:33:21 +0000 (19:33 +0000)]

Merge "Put fragment in specific activity's whitelist" into klp-dev

commit | commitdiff | tree

Lance Chang [Tue, 3 Dec 2013 10:10:43 +0000 (19:10 +0900)]

Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change
Bug: 11923434
Change-Id: I34a353137338b0f8d55e2309f037c34922141181

commit | commitdiff | tree

Geoff Mendal [Mon, 2 Dec 2013 23:31:56 +0000 (23:31 +0000)]

am c07afc7e: (-s ours) am 9d229638: (-s ours) am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE

* commit 'c07afc7eab76cdbd5aeb21fc6a08481d9458b129':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 2 Dec 2013 23:30:59 +0000 (23:30 +0000)]

am 0cf4329d: (-s ours) am 6bb8844a: (-s ours) am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE

* commit '0cf4329dbedbae2a3511d2456ddf50de9c039033':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 2 Dec 2013 20:51:47 +0000 (20:51 +0000)]

am 9d229638: (-s ours) am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE

* commit '9d229638eb78fc25a2699fde5ca2f50eeec57040':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 2 Dec 2013 20:48:22 +0000 (12:48 -0800)]

am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE

* commit 'd6ea675c11285c02a625d59a8d88270649da6a5f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 2 Dec 2013 20:45:29 +0000 (12:45 -0800)]

am f8e1829c: (-s ours) Import translations. DO NOT MERGE

* commit 'f8e1829c99f1ad74131dad12e220b95a629cd9b5':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 2 Dec 2013 20:18:41 +0000 (12:18 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ia18b0553100026091fe8f0aaecb3b8c9992c5fc1
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 2 Dec 2013 20:13:18 +0000 (12:13 -0800)]

Import translations. DO NOT MERGE

Change-Id: I64dae5dfac03e30738558bddc4d44867c2e2b52b
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Wed, 27 Nov 2013 20:42:52 +0000 (20:42 +0000)]

am 6bb8844a: (-s ours) am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE

* commit '6bb8844acd5767999a03ae3217a79a7e3be8251b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 27 Nov 2013 20:39:48 +0000 (12:39 -0800)]

am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE

* commit 'fa1df42735a7d0ef98a2c1d69d9fbe41be9d73d9':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 27 Nov 2013 20:36:00 +0000 (12:36 -0800)]

am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE

* commit 'b8fe3aa2abbf106bb1bb1d651cc59e425309d788':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 27 Nov 2013 20:23:44 +0000 (12:23 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ide520d3a801bcfac862133b6a57e5061cc61f0c9
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Wed, 27 Nov 2013 20:18:28 +0000 (12:18 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ie6abf3e15ab0bdf9c7fcf7fef498a4c23298c653
Auto-generated-cl: translation import

packages/apps/Settings

RSS Atom

About OSDN

Find Software

Develop Software

Help