Sanket Padawe
|
85b04c19ed
|
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.
|
2015-02-26 23:31:28 +00:00 |
|
Sanket Padawe
|
130a76c806
|
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.
|
2015-02-26 23:18:55 +00:00 |
|
Geoff Mendal
|
2061f4e296
|
am cfad6fc1: (-s ours) Import translations. DO NOT MERGE
* commit 'cfad6fc1ff4cc23582d8d1a6cb8371ea32c82544':
Import translations. DO NOT MERGE
|
2015-02-26 23:14:45 +00:00 |
|
Sanket Padawe
|
49d660ac01
|
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.
|
2015-02-26 22:04:34 +00:00 |
|
Sanket Padawe
|
4e838ca96e
|
Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev
|
2015-02-26 21:57:50 +00:00 |
|
Geoff Mendal
|
cfad6fc1ff
|
Import translations. DO NOT MERGE
Change-Id: I6e606f63db232302aa02be469a2560a5455eb11e
Auto-generated-cl: translation import
|
2015-02-26 13:08:22 -08:00 |
|
Lifu Tang
|
a28ffcb56e
|
am 0209af6b: am 6ff1a66c: am 1bbd8814: Removed extra "your" from device only subtext
* commit '0209af6bc7979ef11011d8cce162c437ca472126':
Removed extra "your" from device only subtext
|
2015-02-25 19:56:37 +00:00 |
|
Lifu Tang
|
0209af6bc7
|
am 6ff1a66c: am 1bbd8814: Removed extra "your" from device only subtext
* commit '6ff1a66c3ce39396ec1cb70c45682407faa31376':
Removed extra "your" from device only subtext
|
2015-02-25 19:50:56 +00:00 |
|
Lifu Tang
|
6ff1a66c3c
|
am 1bbd8814: Removed extra "your" from device only subtext
* commit '1bbd8814c66f8e67cfb7e86e880c85727ed1743e':
Removed extra "your" from device only subtext
|
2015-02-25 19:43:20 +00:00 |
|
Lifu Tang
|
1bbd8814c6
|
Removed extra "your" from device only subtext
Bug: 19463511
Change-Id: Ic9449561ee974b6566bf76ea3ca2e774f5be03d2
|
2015-02-24 15:25:27 -08:00 |
|
Sanket Padawe
|
8f77f435d8
|
Use TelephonyManager api to get SPN of sim to display in UI.
Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
|
2015-02-24 13:30:33 -08:00 |
|
Geoff Mendal
|
201e61a0fe
|
am 84725dfb: (-s ours) am e991b546: (-s ours) Import translations. DO NOT MERGE
* commit '84725dfb09399bde98c3541691cc330c46e4050d':
Import translations. DO NOT MERGE
|
2015-02-18 14:14:03 +00:00 |
|
Geoff Mendal
|
84725dfb09
|
am e991b546: (-s ours) Import translations. DO NOT MERGE
* commit 'e991b5461fa67cc92ddcc4cd583a347550f43094':
Import translations. DO NOT MERGE
|
2015-02-18 14:07:43 +00:00 |
|
Geoff Mendal
|
e991b5461f
|
Import translations. DO NOT MERGE
Change-Id: I134f0a955ac0f56ae8b16dbcace0d2fd855025e5
Auto-generated-cl: translation import
|
2015-02-18 05:56:15 -08:00 |
|
Geoff Mendal
|
fc45ee755a
|
am 2594d2bf: (-s ours) Import translations. DO NOT MERGE
* commit '2594d2bf7af8ae0032be068da050535a67989a56':
Import translations. DO NOT MERGE
|
2015-02-18 13:51:26 +00:00 |
|
Geoff Mendal
|
2594d2bf7a
|
Import translations. DO NOT MERGE
Change-Id: I01ad7807e5a92775a53c3c5074425987517b5f95
Auto-generated-cl: translation import
|
2015-02-18 05:44:54 -08:00 |
|
Geoff Mendal
|
4c54180dc7
|
am 5198624c: (-s ours) am ae87c907: (-s ours) Import translations. DO NOT MERGE
* commit '5198624c2a4db659f0fea36ad6cbb66dc734d1e9':
|
2015-02-16 14:33:12 +00:00 |
|
Geoff Mendal
|
5198624c2a
|
am ae87c907: (-s ours) Import translations. DO NOT MERGE
* commit 'ae87c9075e02466f842b0b7fe6a081c899ce954e':
Import translations. DO NOT MERGE
|
2015-02-16 14:27:34 +00:00 |
|
Geoff Mendal
|
576a397100
|
Import translations. DO NOT MERGE
automerge: ae87c90 -s ours
* commit 'ae87c9075e02466f842b0b7fe6a081c899ce954e':
Import translations. DO NOT MERGE
|
2015-02-16 14:26:27 +00:00 |
|
Geoff Mendal
|
ae87c9075e
|
Import translations. DO NOT MERGE
Change-Id: I3870aad14e864485824f4a82c9b266e425c42da3
Auto-generated-cl: translation import
|
2015-02-16 06:14:52 -08:00 |
|
Sanket Padawe
|
4a7ca7d5a7
|
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.
|
2015-02-13 00:01:08 +00:00 |
|
Sanket Padawe
|
bdfdf07ce3
|
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.
|
2015-02-12 23:55:01 +00:00 |
|
Sanket Padawe
|
0362e870b2
|
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.
|
2015-02-12 23:47:52 +00:00 |
|
Sanket Padawe
|
7e21fa5ab4
|
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Bug: 19363726
Change-Id: Id4194deb126323b2f7674c58f9911f892793dff4
|
2015-02-12 12:39:34 -08:00 |
|
Geoff Mendal
|
785bfe719c
|
am 31010cc1: (-s ours) Import translations. DO NOT MERGE
* commit '31010cc15530338fdcf4e1a66a47d29c6851cbc6':
Import translations. DO NOT MERGE
|
2015-02-12 19:20:43 +00:00 |
|
Geoff Mendal
|
31010cc155
|
Import translations. DO NOT MERGE
Change-Id: I130d234905731c2df5249e2c769c572bbb61f94e
Auto-generated-cl: translation import
|
2015-02-12 11:05:53 -08:00 |
|
Alex Klyubin
|
e029b91c53
|
am 1d33bca0: Merge "Hidden ApplicationInfo flags are now in privateFlags."
* commit '1d33bca0e496f980ec1a364f58cccd457d40954a':
Hidden ApplicationInfo flags are now in privateFlags.
|
2015-02-11 19:47:09 +00:00 |
|
Alex Klyubin
|
1d33bca0e4
|
Merge "Hidden ApplicationInfo flags are now in privateFlags."
|
2015-02-11 19:27:25 +00:00 |
|
Geoff Mendal
|
f513ca2fa1
|
am d232a3fa: (-s ours) am 60d2ee87: (-s ours) Import translations. DO NOT MERGE
* commit 'd232a3fa5c86f19ccf559bf4dc649d39d3620ca3':
|
2015-02-11 19:20:15 +00:00 |
|
Alex Klyubin
|
cc254f4da9
|
Hidden ApplicationInfo flags are now in privateFlags.
See b9f8a5204a1b0b3919fa921e858d04124c582828.
Change-Id: I98bbe4b1a5ac0939e0000e4da8b21a1964c75e8b
|
2015-02-11 11:10:12 -08:00 |
|
Geoff Mendal
|
d232a3fa5c
|
am 60d2ee87: (-s ours) Import translations. DO NOT MERGE
* commit '60d2ee878896ccf29f99b825cdbae75182ed41f3':
Import translations. DO NOT MERGE
|
2015-02-11 15:03:56 +00:00 |
|
Geoff Mendal
|
96a90af83b
|
Import translations. DO NOT MERGE
automerge: 60d2ee8 -s ours
* commit '60d2ee878896ccf29f99b825cdbae75182ed41f3':
Import translations. DO NOT MERGE
|
2015-02-11 15:00:50 +00:00 |
|
Geoff Mendal
|
60d2ee8788
|
Import translations. DO NOT MERGE
Change-Id: I7d22626907a0705a5de9956d740ed6ddaf9a6ca0
Auto-generated-cl: translation import
|
2015-02-11 06:50:09 -08:00 |
|
Geoff Mendal
|
278c81a626
|
am 37dfabff: (-s ours) am 713e794d: (-s ours) Import translations. DO NOT MERGE
* commit '37dfabff82bd78d0956f41868579bdf5eb885078':
Import translations. DO NOT MERGE
|
2015-02-09 16:31:32 +00:00 |
|
Geoff Mendal
|
37dfabff82
|
am 713e794d: (-s ours) Import translations. DO NOT MERGE
* commit '713e794dac88e4e977faa95da88163db6a568e15':
Import translations. DO NOT MERGE
|
2015-02-09 16:07:10 +00:00 |
|
Geoff Mendal
|
713e794dac
|
Import translations. DO NOT MERGE
Change-Id: I0bbc9548cc2af07fd420ef97b5b39fe07b96c4d8
Auto-generated-cl: translation import
|
2015-02-09 06:31:43 -08:00 |
|
Geoff Mendal
|
2a9fef1ae7
|
Import translations. DO NOT MERGE
automerge: 40e66bc -s ours
* commit '40e66bce6ceea1b2b9d49a26564665222eb32745':
Import translations. DO NOT MERGE
|
2015-02-04 15:04:49 +00:00 |
|
Geoff Mendal
|
40e66bce6c
|
Import translations. DO NOT MERGE
Change-Id: I6c5b25e39ed6da72c5e7a85329947bec91032120
Auto-generated-cl: translation import
|
2015-02-04 06:50:08 -08:00 |
|
Amith Yamasani
|
47ba346e1e
|
Merge "set tapjacking protection for deviceadmin permission dialog"
automerge: 6317e06
* commit '6317e06635ed52a9d1c1aeb0439017418f57ad0f':
set tapjacking protection for deviceadmin permission dialog
|
2015-02-03 21:29:19 +00:00 |
|
Amith Yamasani
|
6317e06635
|
Merge "set tapjacking protection for deviceadmin permission dialog"
|
2015-02-03 21:24:51 +00:00 |
|
Sanket Padawe
|
2493118a3c
|
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev automerge: 4decadb
automerge: c1af278
* commit 'c1af278c9da7f355fd9da883efb88a3e4d0f3b19':
Remove SimDialogActivity from recents app list.
|
2015-02-03 18:19:05 +00:00 |
|
Sanket Padawe
|
c1af278c9d
|
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
automerge: 4decadb
* commit '4decadbc44b12cca8790b4d27ab9c29e34cb9909':
Remove SimDialogActivity from recents app list.
|
2015-02-03 18:14:03 +00:00 |
|
Sanket Padawe
|
4decadbc44
|
Merge "Remove SimDialogActivity from recents app list." into lmp-mr1-dev
|
2015-02-03 18:10:47 +00:00 |
|
Andres Morales
|
4bd31b9ac6
|
am 2e75203a: Use getDefaultAdapter instead of getNfcAdapter
automerge: 98d8a49
* commit '98d8a490d5930c9f6179c8aefe792012c542ddbb':
Use getDefaultAdapter instead of getNfcAdapter
|
2015-02-03 16:01:45 +00:00 |
|
Andres Morales
|
98d8a490d5
|
am 2e75203a: Use getDefaultAdapter instead of getNfcAdapter
* commit '2e75203a6ecb81725b68bced6c5f8d5be37365f1':
Use getDefaultAdapter instead of getNfcAdapter
|
2015-02-03 15:53:17 +00:00 |
|
Sanket Padawe
|
ffd96559e7
|
Remove SimDialogActivity from recents app list.
Bug: 19237301
Change-Id: I09f12c16e5afc0058f19f92ffbfd930fa099fd9b
|
2015-02-02 16:46:55 -08:00 |
|
Andres Morales
|
2e75203a6e
|
Use getDefaultAdapter instead of getNfcAdapter
getNfcAdapter can throw an exception if NFC is not
available
Bug: 19227597
Change-Id: Ib95849057938066dc5760a34f16333f5423ce61f
|
2015-02-02 13:39:57 -08:00 |
|
Geoff Mendal
|
c202347d6e
|
am 0bb8ba32: (-s ours) Import translations. DO NOT MERGE
* commit '0bb8ba322e0bed9d988e14888079c5d6283cfacc':
Import translations. DO NOT MERGE
|
2015-02-02 15:30:26 +00:00 |
|
Geoff Mendal
|
0bb8ba322e
|
Import translations. DO NOT MERGE
Change-Id: I3dc578880274b5d2625b2686be2cd56589bb486a
Auto-generated-cl: translation import
|
2015-02-02 06:52:47 -08:00 |
|
Robin Lee
|
70dbf05d50
|
am 528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
automerge: d16231d
* commit 'd16231de248aeb5aeccb8f4aa226a2f1b34cc082':
Repair broken keychain wifi_uid logic
|
2015-02-02 11:45:57 +00:00 |
|