OSDN Git Service
Elliott Hughes [Thu, 2 Apr 2015 17:50:21 +0000 (17:50 +0000)]
am
ff095ab0: am
189d7e8e: Merge "Add Europe/Istanbul timezone"
* commit '
ff095ab05bc6660abd38d9de047ac467c2d070fc':
Add Europe/Istanbul timezone
Elliott Hughes [Thu, 2 Apr 2015 17:40:44 +0000 (17:40 +0000)]
am
189d7e8e: Merge "Add Europe/Istanbul timezone"
* commit '
189d7e8e5151cc8774f4c7eb1b00e8efabdc627f':
Add Europe/Istanbul timezone
Elliott Hughes [Thu, 2 Apr 2015 17:19:27 +0000 (17:19 +0000)]
Merge "Add Europe/Istanbul timezone"
Samuel Asteberg [Mon, 22 Sep 2014 10:24:40 +0000 (12:24 +0200)]
Add Europe/Istanbul timezone
Change-Id: I522107e7aead4d7ec587a19202af23df71d16d83
Elliott Hughes [Thu, 2 Apr 2015 02:33:26 +0000 (02:33 +0000)]
am
144c48e7: am
49fe5084: Merge "add Recife timezone"
* commit '
144c48e72736ce9617dfa15331262c13819a17e6':
add Recife timezone
Elliott Hughes [Thu, 2 Apr 2015 01:13:17 +0000 (01:13 +0000)]
am
49fe5084: Merge "add Recife timezone"
* commit '
49fe5084f73821906572f60bd542ca5042cb794d':
add Recife timezone
Elliott Hughes [Wed, 1 Apr 2015 23:55:55 +0000 (23:55 +0000)]
Merge "add Recife timezone"
Jason Sams [Fri, 27 Mar 2015 01:24:58 +0000 (01:24 +0000)]
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev
Stuart Scott [Fri, 27 Mar 2015 01:10:27 +0000 (01:10 +0000)]
Stuart Scott [Fri, 27 Mar 2015 00:50:43 +0000 (00:50 +0000)]
Stuart Scott [Fri, 27 Mar 2015 00:34:46 +0000 (00:34 +0000)]
am
53eec9fa: Fix sim notifications.
* commit '
53eec9faad4f96497ab5cccaadb05963c3694363':
Fix sim notifications.
Stuart Scott [Wed, 25 Mar 2015 22:04:59 +0000 (22:04 +0000)]
am
4a682e56: am
c28e80b8: am
53eec9fa: Fix sim notifications.
* commit '
4a682e56c80435e1f3ce7bc8ae848337a2426fc3':
Fix sim notifications.
Stuart Scott [Wed, 25 Mar 2015 20:34:04 +0000 (20:34 +0000)]
am
c28e80b8: am
53eec9fa: Fix sim notifications.
* commit '
c28e80b8fb1a4fd6d326bbb79547f3597cf0412f':
Fix sim notifications.
Stuart Scott [Wed, 25 Mar 2015 19:48:23 +0000 (19:48 +0000)]
am
53eec9fa: Fix sim notifications.
* commit '
53eec9faad4f96497ab5cccaadb05963c3694363':
Fix sim notifications.
Stuart Scott [Mon, 16 Mar 2015 19:17:56 +0000 (12:17 -0700)]
Fix sim notifications.
bug:
19705366
Change-Id: I1d1f2dc5cf1d4580ab503c88853b089db0362242
Geoff Mendal [Mon, 23 Mar 2015 13:02:39 +0000 (13:02 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 23 Mar 2015 12:55:53 +0000 (12:55 +0000)]
am
674d1d6b: (-s ours) am
47d342c3: (-s ours) Import translations. DO NOT MERGE
* commit '
674d1d6be522defb7934c9e66e439ed99e827bc4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Mar 2015 12:49:40 +0000 (12:49 +0000)]
am
47d342c3: (-s ours) Import translations. DO NOT MERGE
* commit '
47d342c371683ca1c02ad709f4eed27541cb8e5f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Mar 2015 12:46:37 +0000 (07:46 -0500)]
Import translations. DO NOT MERGE
Change-Id: I40cd8ee6c6901d97827a93e1f6fa33a8a4cfe4db
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Mar 2015 12:35:10 +0000 (07:35 -0500)]
Import translations. DO NOT MERGE
Change-Id: I136df854ba22b1b72b4c0a4a644202838285e8c4
Auto-generated-cl: translation import
Geoff Mendal [Sat, 21 Mar 2015 17:08:16 +0000 (17:08 +0000)]
am
4b52bfbb: (-s ours) am
d20acfeb: (-s ours) Import translations. DO NOT MERGE
* commit '
4b52bfbbfa39092ca4299f7f29eaa08be359ac91':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 21 Mar 2015 16:20:55 +0000 (16:20 +0000)]
am
d20acfeb: (-s ours) Import translations. DO NOT MERGE
* commit '
d20acfeb3fbeb9ea54bf049a0e8fe66ef0f64f22':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 21 Mar 2015 06:22:04 +0000 (01:22 -0500)]
Import translations. DO NOT MERGE
Change-Id: I9a02bfcde8e9387db93ed7b3322d1af68ee59695
Auto-generated-cl: translation import
Geoff Mendal [Sat, 21 Mar 2015 06:10:51 +0000 (01:10 -0500)]
Import translations. DO NOT MERGE
Change-Id: Idf67f4e0412fa4bc70819dda56004d6f40155e90
Auto-generated-cl: translation import
Geoff Mendal [Wed, 18 Mar 2015 18:24:08 +0000 (18:24 +0000)]
am
b9b1124c: (-s ours) am
ac8641ed: (-s ours) Import translations. DO NOT MERGE
* commit '
b9b1124cd7cd1109068d8bba1cf3a35c1626f32f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 16:54:53 +0000 (16:54 +0000)]
am
ac8641ed: (-s ours) Import translations. DO NOT MERGE
* commit '
ac8641ede6c0c4d4062789ed019954c7e1f77d9b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 12:56:44 +0000 (05:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia82339bdeddcb2be2864732de532c5d669d9a286
Auto-generated-cl: translation import
Geoff Mendal [Wed, 18 Mar 2015 12:50:58 +0000 (12:50 +0000)]
am
a03c39aa: (-s ours) Import translations. DO NOT MERGE
* commit '
a03c39aae8309416364d6d0ccbb0ec89c009b05d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 12:45:01 +0000 (05:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I13ef4dce2edd63600d99c7234274f5b2daafd943
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 13:10:47 +0000 (13:10 +0000)]
am
d28b6bae: (-s ours) am
01492de4: (-s ours) Import translations. DO NOT MERGE
* commit '
d28b6bae2491145241eb4e3a3384ed059f615234':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:03:30 +0000 (13:03 +0000)]
am
01492de4: (-s ours) Import translations. DO NOT MERGE
* commit '
01492de48d374833e8b4d304308e5fd394eeafcc':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:49:26 +0000 (12:49 +0000)]
am
d1e37422: (-s ours) Import translations. DO NOT MERGE
* commit '
d1e37422b255a9417dfa5c6cb30e03e177fed5ad':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:44:27 +0000 (05:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I785caae50a0df960b25d862e06b2fa8010c1bd26
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 12:32:21 +0000 (05:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie8486278c1326c35e32e3c87323de45e7225c83e
Auto-generated-cl: translation import
Geoff Mendal [Wed, 11 Mar 2015 17:25:25 +0000 (17:25 +0000)]
am
feb731a2: (-s ours) am
dd07a862: (-s ours) Import translations. DO NOT MERGE
* commit '
feb731a2c94d2238587d1a84d0a2d09f99329612':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 17:25:11 +0000 (17:25 +0000)]
am
f02db6b7: (-s ours) Import translations. DO NOT MERGE
* commit '
f02db6b7e8fc774e64b812613cde7746d31aa10e':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 12:49:26 +0000 (12:49 +0000)]
am
dd07a862: (-s ours) Import translations. DO NOT MERGE
* commit '
dd07a86251dd79190bdc7bc811ae09c65eab89d2':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 12:40:13 +0000 (05:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia9a0856a78edd8afe8c540b8c68e88b063b34b1d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 11 Mar 2015 12:28:40 +0000 (05:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia835e0d6c351a29462c1d8adcd002f6f1bec598b
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Mar 2015 17:01:45 +0000 (17:01 +0000)]
am
fd8f5459: (-s ours) am
0d8c3df4: (-s ours) Import translations. DO NOT MERGE
* commit '
fd8f545977ae4b5826632d8de293b3d322ae9960':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Mar 2015 15:45:14 +0000 (15:45 +0000)]
am
0d8c3df4: (-s ours) Import translations. DO NOT MERGE
* commit '
0d8c3df4d95ec000889e3406ea50475e5d299874':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Mar 2015 15:35:57 +0000 (15:35 +0000)]
am
f91c51b1: (-s ours) Import translations. DO NOT MERGE
* commit '
f91c51b13b750f5ccc62ee1d760bd470b78837bb':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Mar 2015 12:41:43 +0000 (05:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: If88c28e5bfe82169fa423ef04bc7cc4ee2aa9962
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Mar 2015 12:30:12 +0000 (05:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9e9281f6e2d2e50882fcec514ffc28993787a62a
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Mar 2015 13:54:47 +0000 (13:54 +0000)]
am
a07520f6: (-s ours) am
ba5c9ed1: (-s ours) Import translations. DO NOT MERGE
* commit '
a07520f6888981f4e310aa3c3c49ff6ea04b51d0':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:47:20 +0000 (13:47 +0000)]
am
ba5c9ed1: (-s ours) Import translations. DO NOT MERGE
* commit '
ba5c9ed1835cb3eef7dcf6e2968be1b0e5316dc5':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:41:50 +0000 (05:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I51a7c7c78b210268bc543e3ca81e123b02c0e525
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Mar 2015 13:37:29 +0000 (13:37 +0000)]
am
b4ee938f: (-s ours) Import translations. DO NOT MERGE
* commit '
b4ee938f74fdf6ffe3cad237342d7f5034a55053':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:30:02 +0000 (05:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1e33ed430ca8680d04f1bccd0253b8e7620c28e3
Auto-generated-cl: translation import
Geoff Mendal [Mon, 2 Mar 2015 14:20:44 +0000 (14:20 +0000)]
am
a377ea1c: (-s ours) am
130fc5ca: (-s ours) Import translations. DO NOT MERGE
* commit '
a377ea1cb1478503629a7b38c8b11687c7658599':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 14:13:01 +0000 (14:13 +0000)]
am
130fc5ca: (-s ours) Import translations. DO NOT MERGE
* commit '
130fc5caf8083581f7a3d66930b5ae39e2b4ccd1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 13:55:58 +0000 (13:55 +0000)]
am
5c66aacd: (-s ours) Import translations. DO NOT MERGE
* commit '
5c66aacd419460e79e84bc0a324cbb60152f32c1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 2 Mar 2015 13:55:15 +0000 (05:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iaf3498c2c21da6853e8f80ba582c2d4ac6309331
Auto-generated-cl: translation import
Geoff Mendal [Mon, 2 Mar 2015 13:43:21 +0000 (05:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: I81c7b09f5de8fffe27b732d45ff00d02ad5e26d1
Auto-generated-cl: translation import
Sanket Padawe [Thu, 26 Feb 2015 23:31:28 +0000 (23:31 +0000)]
am
130a76c8: am
49d660ac: am
4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
* commit '
130a76c806469b5b814b1d647713dd0cdec1fe9f':
Use TelephonyManager api to get SPN of sim to display in UI.
Sanket Padawe [Thu, 26 Feb 2015 23:18:55 +0000 (23:18 +0000)]
am
49d660ac: am
4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
* commit '
49d660ac014c3802aa5e694d745b284fc2b601ae':
Use TelephonyManager api to get SPN of sim to display in UI.
Geoff Mendal [Thu, 26 Feb 2015 23:14:45 +0000 (23:14 +0000)]
am
cfad6fc1: (-s ours) Import translations. DO NOT MERGE
* commit '
cfad6fc1ff4cc23582d8d1a6cb8371ea32c82544':
Import translations. DO NOT MERGE
Sanket Padawe [Thu, 26 Feb 2015 22:04:34 +0000 (22:04 +0000)]
am
4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
* commit '
4e838ca96ec1ebf1df3d75e729facf1fc012b431':
Use TelephonyManager api to get SPN of sim to display in UI.
Sanket Padawe [Thu, 26 Feb 2015 21:57:50 +0000 (21:57 +0000)]
Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
Geoff Mendal [Thu, 26 Feb 2015 21:08:22 +0000 (13:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6e606f63db232302aa02be469a2560a5455eb11e
Auto-generated-cl: translation import
Lifu Tang [Wed, 25 Feb 2015 19:56:37 +0000 (19:56 +0000)]
am
0209af6b: am
6ff1a66c: am
1bbd8814: Removed extra "your" from device only subtext
* commit '
0209af6bc7979ef11011d8cce162c437ca472126':
Removed extra "your" from device only subtext
Lifu Tang [Wed, 25 Feb 2015 19:50:56 +0000 (19:50 +0000)]
am
6ff1a66c: am
1bbd8814: Removed extra "your" from device only subtext
* commit '
6ff1a66c3ce39396ec1cb70c45682407faa31376':
Removed extra "your" from device only subtext
Lifu Tang [Wed, 25 Feb 2015 19:43:20 +0000 (19:43 +0000)]
am
1bbd8814: Removed extra "your" from device only subtext
* commit '
1bbd8814c66f8e67cfb7e86e880c85727ed1743e':
Removed extra "your" from device only subtext
Lifu Tang [Tue, 24 Feb 2015 23:25:27 +0000 (15:25 -0800)]
Removed extra "your" from device only subtext
Bug:
19463511
Change-Id: Ic9449561ee974b6566bf76ea3ca2e774f5be03d2
Sanket Padawe [Tue, 24 Feb 2015 21:30:33 +0000 (13:30 -0800)]
Use TelephonyManager api to get SPN of sim to display in UI.
Bug:
19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
Geoff Mendal [Wed, 18 Feb 2015 14:14:03 +0000 (14:14 +0000)]
am
84725dfb: (-s ours) am
e991b546: (-s ours) Import translations. DO NOT MERGE
* commit '
84725dfb09399bde98c3541691cc330c46e4050d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Feb 2015 14:07:43 +0000 (14:07 +0000)]
am
e991b546: (-s ours) Import translations. DO NOT MERGE
* commit '
e991b5461fa67cc92ddcc4cd583a347550f43094':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Feb 2015 13:56:15 +0000 (05:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I134f0a955ac0f56ae8b16dbcace0d2fd855025e5
Auto-generated-cl: translation import
Geoff Mendal [Wed, 18 Feb 2015 13:51:26 +0000 (13:51 +0000)]
am
2594d2bf: (-s ours) Import translations. DO NOT MERGE
* commit '
2594d2bf7af8ae0032be068da050535a67989a56':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Feb 2015 13:44:54 +0000 (05:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I01ad7807e5a92775a53c3c5074425987517b5f95
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Feb 2015 14:33:12 +0000 (14:33 +0000)]
am
5198624c: (-s ours) am
ae87c907: (-s ours) Import translations. DO NOT MERGE
* commit '
5198624c2a4db659f0fea36ad6cbb66dc734d1e9':
Geoff Mendal [Mon, 16 Feb 2015 14:27:34 +0000 (14:27 +0000)]
am
ae87c907: (-s ours) Import translations. DO NOT MERGE
* commit '
ae87c9075e02466f842b0b7fe6a081c899ce954e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Feb 2015 14:26:27 +0000 (14:26 +0000)]
Import translations. DO NOT MERGE
automerge:
ae87c90 -s ours
* commit '
ae87c9075e02466f842b0b7fe6a081c899ce954e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Feb 2015 14:14:52 +0000 (06:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3870aad14e864485824f4a82c9b266e425c42da3
Auto-generated-cl: translation import
Sanket Padawe [Fri, 13 Feb 2015 00:01:08 +0000 (00:01 +0000)]
am
bdfdf07c: am
0362e870: am
7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
* commit '
bdfdf07ce3b788d2962f75027f6be615c9784e10':
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Sanket Padawe [Thu, 12 Feb 2015 23:55:01 +0000 (23:55 +0000)]
am
0362e870: am
7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
* commit '
0362e870b258b03ec06110d032b521cac3d37bf2':
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Sanket Padawe [Thu, 12 Feb 2015 23:47:52 +0000 (23:47 +0000)]
am
7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
* commit '
7e21fa5ab4f867263088a38ed279d889b902a05b':
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Sanket Padawe [Thu, 12 Feb 2015 20:39:34 +0000 (12:39 -0800)]
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Bug:
19363726
Change-Id: Id4194deb126323b2f7674c58f9911f892793dff4
Geoff Mendal [Thu, 12 Feb 2015 19:20:43 +0000 (19:20 +0000)]
am
31010cc1: (-s ours) Import translations. DO NOT MERGE
* commit '
31010cc15530338fdcf4e1a66a47d29c6851cbc6':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 19:05:53 +0000 (11:05 -0800)]
Import translations. DO NOT MERGE
Change-Id: I130d234905731c2df5249e2c769c572bbb61f94e
Auto-generated-cl: translation import
Alex Klyubin [Wed, 11 Feb 2015 19:47:09 +0000 (19:47 +0000)]
am
1d33bca0: Merge "Hidden ApplicationInfo flags are now in privateFlags."
* commit '
1d33bca0e496f980ec1a364f58cccd457d40954a':
Hidden ApplicationInfo flags are now in privateFlags.
Alex Klyubin [Wed, 11 Feb 2015 19:27:24 +0000 (19:27 +0000)]
Merge "Hidden ApplicationInfo flags are now in privateFlags."
Geoff Mendal [Wed, 11 Feb 2015 19:20:15 +0000 (19:20 +0000)]
am
d232a3fa: (-s ours) am
60d2ee87: (-s ours) Import translations. DO NOT MERGE
* commit '
d232a3fa5c86f19ccf559bf4dc649d39d3620ca3':
Alex Klyubin [Wed, 4 Feb 2015 16:47:12 +0000 (08:47 -0800)]
Hidden ApplicationInfo flags are now in privateFlags.
See
b9f8a5204a1b0b3919fa921e858d04124c582828.
Change-Id: I98bbe4b1a5ac0939e0000e4da8b21a1964c75e8b
Geoff Mendal [Wed, 11 Feb 2015 15:03:56 +0000 (15:03 +0000)]
am
60d2ee87: (-s ours) Import translations. DO NOT MERGE
* commit '
60d2ee878896ccf29f99b825cdbae75182ed41f3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Feb 2015 15:00:50 +0000 (15:00 +0000)]
Import translations. DO NOT MERGE
automerge:
60d2ee8 -s ours
* commit '
60d2ee878896ccf29f99b825cdbae75182ed41f3':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Feb 2015 14:50:09 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7d22626907a0705a5de9956d740ed6ddaf9a6ca0
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Feb 2015 16:31:32 +0000 (16:31 +0000)]
am
37dfabff: (-s ours) am
713e794d: (-s ours) Import translations. DO NOT MERGE
* commit '
37dfabff82bd78d0956f41868579bdf5eb885078':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Feb 2015 16:07:10 +0000 (16:07 +0000)]
am
713e794d: (-s ours) Import translations. DO NOT MERGE
* commit '
713e794dac88e4e977faa95da88163db6a568e15':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Feb 2015 14:31:43 +0000 (06:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0bbc9548cc2af07fd420ef97b5b39fe07b96c4d8
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Feb 2015 15:04:49 +0000 (15:04 +0000)]
Import translations. DO NOT MERGE
automerge:
40e66bc -s ours
* commit '
40e66bce6ceea1b2b9d49a26564665222eb32745':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Feb 2015 14:50:08 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6c5b25e39ed6da72c5e7a85329947bec91032120
Auto-generated-cl: translation import
Amith Yamasani [Tue, 3 Feb 2015 21:29:19 +0000 (21:29 +0000)]
Merge "set tapjacking protection for deviceadmin permission dialog"
automerge:
6317e06
* commit '
6317e06635ed52a9d1c1aeb0439017418f57ad0f':
set tapjacking protection for deviceadmin permission dialog
Amith Yamasani [Tue, 3 Feb 2015 21:24:51 +0000 (21:24 +0000)]
Merge "set tapjacking protection for deviceadmin permission dialog"
Sanket Padawe [Tue, 3 Feb 2015 18:19:05 +0000 (18:19 +0000)]
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev automerge:
4decadb
automerge:
c1af278
* commit '
c1af278c9da7f355fd9da883efb88a3e4d0f3b19':
Remove SimDialogActivity from recents app list.
Sanket Padawe [Tue, 3 Feb 2015 18:14:03 +0000 (18:14 +0000)]
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
automerge:
4decadb
* commit '
4decadbc44b12cca8790b4d27ab9c29e34cb9909':
Remove SimDialogActivity from recents app list.
Sanket Padawe [Tue, 3 Feb 2015 18:10:47 +0000 (18:10 +0000)]
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
Andres Morales [Tue, 3 Feb 2015 16:01:45 +0000 (16:01 +0000)]
am
2e75203a: Use getDefaultAdapter instead of getNfcAdapter
automerge:
98d8a49
* commit '
98d8a490d5930c9f6179c8aefe792012c542ddbb':
Use getDefaultAdapter instead of getNfcAdapter
Andres Morales [Tue, 3 Feb 2015 15:53:17 +0000 (15:53 +0000)]
am
2e75203a: Use getDefaultAdapter instead of getNfcAdapter
* commit '
2e75203a6ecb81725b68bced6c5f8d5be37365f1':
Use getDefaultAdapter instead of getNfcAdapter
Sanket Padawe [Tue, 3 Feb 2015 00:46:55 +0000 (16:46 -0800)]
Remove SimDialogActivity from recents app list.
Bug:
19237301
Change-Id: I09f12c16e5afc0058f19f92ffbfd930fa099fd9b
OSDN Git Service
