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
Alan Viverette
a330af1327
Merge "Add preference for caption text opacity"
2013-12-05 19:33:52 +00:00
Alan Viverette
205cee4c1c
Add preference for caption text opacity
...
BUG: 11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
2013-12-05 11:27:40 -08: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
Geoff Mendal
bff561cfd7
Import translations. DO NOT MERGE
...
Change-Id: Ib2166418fe68c233b3015b1cab029729abcfcca3
Auto-generated-cl: translation import
2013-12-04 13:33:47 -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
eba89f4fae
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
2013-12-04 21:14:44 +00:00
Amith Yamasani
482b34eaad
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
2013-12-04 21:14:43 +00: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
38bfb392c7
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
2013-12-03 19:45:49 +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
Amith Yamasani
72a7afb093
Merge "Put fragment in specific activity's whitelist" into klp-dev
2013-12-03 19:33:21 +00:00
Lance Chang
5796dad9a4
Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change
...
Bug: 11923434
Change-Id: I34a353137338b0f8d55e2309f037c34922141181
2013-12-03 19:16:12 +09:00
Geoff Mendal
01b6b40506
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
2013-12-02 23:31:56 +00:00
Geoff Mendal
da59631e93
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
2013-12-02 23:30:59 +00:00
Geoff Mendal
c07afc7eab
am 9d229638: (-s ours) am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE
...
* commit '9d229638eb78fc25a2699fde5ca2f50eeec57040':
Import translations. DO NOT MERGE
2013-12-02 20:51:47 +00:00
Geoff Mendal
9d229638eb
am d6ea675c: (-s ours) am f8e1829c: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd6ea675c11285c02a625d59a8d88270649da6a5f':
Import translations. DO NOT MERGE
2013-12-02 12:48:22 -08:00
Geoff Mendal
d6ea675c11
am f8e1829c: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f8e1829c99f1ad74131dad12e220b95a629cd9b5':
Import translations. DO NOT MERGE
2013-12-02 12:45:29 -08:00
Geoff Mendal
ddc4bf8dd1
Import translations. DO NOT MERGE
...
Change-Id: Ia18b0553100026091fe8f0aaecb3b8c9992c5fc1
Auto-generated-cl: translation import
2013-12-02 12:18:41 -08:00
Geoff Mendal
f8e1829c99
Import translations. DO NOT MERGE
...
Change-Id: I64dae5dfac03e30738558bddc4d44867c2e2b52b
Auto-generated-cl: translation import
2013-12-02 12:13:18 -08:00
Geoff Mendal
0cf4329dbe
am 6bb8844a: (-s ours) am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE
...
* commit '6bb8844acd5767999a03ae3217a79a7e3be8251b':
Import translations. DO NOT MERGE
2013-11-27 20:42:52 +00:00
Geoff Mendal
6bb8844acd
am fa1df427: (-s ours) am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fa1df42735a7d0ef98a2c1d69d9fbe41be9d73d9':
Import translations. DO NOT MERGE
2013-11-27 12:39:48 -08:00
Geoff Mendal
fa1df42735
am b8fe3aa2: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b8fe3aa2abbf106bb1bb1d651cc59e425309d788':
Import translations. DO NOT MERGE
2013-11-27 12:36:00 -08:00
