Baligh Uddin
5ecc395ef2
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
2013-07-11 21:50:16 +00:00
Baligh Uddin
9598002ab5
am 2a1ccab1: Import translations. DO NOT MERGE
...
* commit '2a1ccab1cdd00af6989eadba1a766120d0b10243':
Import translations. DO NOT MERGE
2013-07-11 12:23:19 -07:00
Wink Saville
b464478664
VZW wants the phoneNumber to be 10 zero's if there isn't one.
...
Bug: 9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859
2013-07-10 22:19:26 -07:00
Baligh Uddin
7c992b80cf
Import translations. DO NOT MERGE
...
Change-Id: I8112e19acd0d8d12b5435d467c40e9b93162fca8
Auto-generated-cl: translation import
2013-07-10 20:30:12 -07:00
Baligh Uddin
2a1ccab1cd
Import translations. DO NOT MERGE
...
Change-Id: I6b02734b2ef1396af16da6e8102cdbb6ca79a50c
Auto-generated-cl: translation import
2013-07-10 20:28:57 -07:00
Baligh Uddin
55077df18a
am f1d02056: Import translations. DO NOT MERGE
...
* commit 'f1d02056d967b2660424f181ce547b846a92fdec':
Import translations. DO NOT MERGE
2013-07-08 14:35:21 -07:00
Baligh Uddin
20a554fa50
Import translations. DO NOT MERGE
...
Change-Id: I5abf06c94c0aa4a90a11b0a14fe6f04ec6d003c9
Auto-generated-cl: translation import
2013-07-08 09:18:57 -07:00
Baligh Uddin
f1d02056d9
Import translations. DO NOT MERGE
...
Change-Id: I7d34201de76770bcb6a1998c6d898830ca290006
Auto-generated-cl: translation import
2013-07-08 09:17:21 -07:00
Baligh Uddin
8bd9f2f287
am 76185f72: Import translations. DO NOT MERGE
...
* commit '76185f7201b3e8a2d341a62c13f8ac259203a7e7':
Import translations. DO NOT MERGE
2013-07-03 14:24:47 -07:00
Baligh Uddin
df0ad0dc86
am aa03b2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'aa03b2f6a61bc2ea4e7ad9b07a2841363a3a7a73':
Import translations. DO NOT MERGE
2013-07-03 14:24:47 -07:00
Baligh Uddin
ad965c173b
Import translations. DO NOT MERGE
...
Change-Id: I45c8315e3a471262b48485768ba402b35b559886
Auto-generated-cl: translation import
2013-07-03 13:56:12 -07:00
Baligh Uddin
76185f7201
Import translations. DO NOT MERGE
...
Change-Id: Ia71c4566436300b1c190865f9dc0d490d62d8ebb
Auto-generated-cl: translation import
2013-07-03 13:54:27 -07:00
Baligh Uddin
e462f0d5b9
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
2013-07-02 16:34:32 +00:00
Baligh Uddin
aa03b2f6a6
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-07-02 16:34:18 +00:00
Wink Saville
7319f2b123
am 5d5a269f: Add Manage mobile plan to Settings.
...
* commit '5d5a269f59aa5caa986eff3cb988d7585b2cd43c':
Add Manage mobile plan to Settings.
2013-07-01 16:31:35 -07:00
Wink Saville
5d5a269f59
Add Manage mobile plan to Settings.
...
Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
2013-07-01 16:27:10 -07:00
Dianne Hackborn
1ad26e9c37
Completely remove app ops activity.
...
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
2013-07-01 12:54:54 -07:00
Baligh Uddin
e90462d2e3
Import translations. DO NOT MERGE
...
Change-Id: I2fb9c2692fa420eee7416690dc768a966ff1a9b9
Auto-generated-cl: translation import
2013-07-01 09:20:37 -07:00
Baligh Uddin
a2fa332286
Import translations. DO NOT MERGE
...
Change-Id: I69c1ffe7da49a43516d5233f6f4c7cec6227eb04
Auto-generated-cl: translation import
2013-07-01 09:19:04 -07:00
Amith Yamasani
51d2ff7561
am bf87f7d7: Fix inconsistent string
...
* commit 'bf87f7d78d7c09f6b928cc0a33e77c5130436c72':
Fix inconsistent string
2013-06-27 14:46:36 -07:00
Amith Yamasani
bf87f7d78d
Fix inconsistent string
...
Bug: 9602425
Change-Id: I2c5a2350668e48f12e821e0553df56ed08d373f5
2013-06-27 09:41:15 -07:00
Dianne Hackborn
675710849a
am 5da4c907: Merge "Fix issue #9486022 : Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev
...
* commit '5da4c9079cc06c4ff4117cf6021d2e0800c99f37':
Fix issue #9486022 : Disabled Apps column doesn't always show up in Manage Apps
2013-06-20 14:39:39 -07:00
Dianne Hackborn
5da4c9079c
Merge "Fix issue #9486022 : Disabled Apps column doesn't always show up in Manage Apps" into jb-mr2-dev
2013-06-20 21:38:30 +00:00
Baligh Uddin
178baecf98
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
2013-06-20 16:27:38 +00:00
Baligh Uddin
e0878e3570
am 80a0d9a3: Import translations. DO NOT MERGE
...
* commit '80a0d9a37c4c70c538bce0ae7bc2fd83339e15ac':
Import translations. DO NOT MERGE
2013-06-20 08:33:56 -07:00
Dianne Hackborn
f5f08628cc
Fix issue #9486022 : Disabled Apps column doesn't always show up in Manage Apps
...
We need to resume the current tab before checking to see if
there are any disabled apps and deciding from that the number
of tabs to show.
Change-Id: I95037f15ff7a97f0234143d10ebcee79224a3114
2013-06-19 17:01:51 -07:00
Baligh Uddin
ac7a28288c
Import translations. DO NOT MERGE
...
Change-Id: Ie094379c6e1458b839192420b31291372b09dfda
Auto-generated-cl: translation import
2013-06-19 12:41:33 -07:00
Baligh Uddin
80a0d9a37c
Import translations. DO NOT MERGE
...
Change-Id: Ia1811e28f847bc50278d40cfe989e2fa284d0f12
Auto-generated-cl: translation import
2013-06-19 12:40:06 -07:00
Baligh Uddin
7a42c80935
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
2013-06-17 19:01:51 +00:00
Baligh Uddin
f7c2889c45
am 7f37c30b: (-s ours) Import translations. DO NOT MERGE
...
* commit '7f37c30b713e29494f00c85916fc4fee246f2936':
Import translations. DO NOT MERGE
2013-06-17 09:27:45 -07:00
Baligh Uddin
e8d4b1a32c
Import translations. DO NOT MERGE
...
Change-Id: I37d7ec7d90da8ac2f9b4b48e75ddbaea44f02ae1
Auto-generated-cl: translation import
2013-06-17 09:15:49 -07:00
Baligh Uddin
7f37c30b71
Import translations. DO NOT MERGE
...
Change-Id: I7da4461fe8f9c64191a5e0c46ae6d5ad4d7293a1
Auto-generated-cl: translation import
2013-06-17 09:14:19 -07:00
Baligh Uddin
0117cc7ce5
Import translations. DO NOT MERGE
...
Change-Id: I5b53d1be101da33a7aaa664eccf887e0b17c0b97
Auto-generated-cl: translation import
2013-06-12 12:51:36 -07:00
Amith Yamasani
f3e827e83d
Merge "Don't show ApnEditor as a dialog" into jb-mr2-dev
2013-06-07 21:53:15 +00:00
Baligh Uddin
2db8ca13a7
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-06-07 19:19:41 +00:00
Amith Yamasani
1b79c5c804
Merge "Allow hidden apps to opt-out" into jb-mr2-dev
2013-06-07 17:45:26 +00:00
Amith Yamasani
34bd7e68db
Don't show ApnEditor as a dialog
...
Else it would be missing the menu buttons.
Bug: 7328535
Change-Id: I8e30eec0b3d23dadd9ab6f1efbaa185fe1b6b431
2013-06-07 10:19:55 -07:00
Alex Klyubin
681b21f3e4
resolved conflicts for merge of 5d21820a to jb-mr2-dev
...
Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31
2013-06-06 15:45:23 -07:00
Alex Klyubin
56604046c5
am 5aa3f878: (-s ours) am 0c32da7e: am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed.
...
* commit '5aa3f8782432c79d01702ca6a7214793501bd476':
Ensure all active Device Admins are listed.
2013-06-06 15:41:41 -07:00
Alex Klyubin
5d21820a97
am a65fa934: am 8bfb859e: am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
...
* commit 'a65fa934f19ebfe59a8458be733e783292ad8d9c':
Permit deactivation of malformed Device Admins.
2013-06-06 15:35:41 -07:00
Alex Klyubin
5aa3f87824
am 0c32da7e: am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed.
...
* commit '0c32da7ee01f7f523a889c5faf1a449e664f8bce':
Ensure all active Device Admins are listed.
2013-06-06 15:35:34 -07:00
Alex Klyubin
a65fa934f1
am 8bfb859e: am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
...
* commit '8bfb859e3b81a9b6448c17cfb02a0aa748580231':
Permit deactivation of malformed Device Admins.
2013-06-06 15:33:46 -07:00
Alex Klyubin
0c32da7ee0
am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed.
...
* commit '6f28e3420ade08f05588d35937b772ffb5cdaf83':
Ensure all active Device Admins are listed.
2013-06-06 15:33:45 -07:00
Alex Klyubin
8bfb859e3b
am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
...
* commit '8d5aeffa7dc27eba60fe4c64be6a89e645091958':
Permit deactivation of malformed Device Admins.
2013-06-06 15:32:00 -07:00
Alex Klyubin
6f28e3420a
am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed.
...
* commit '9f6a193394de16bfe398c8b7424f273231c77134':
Ensure all active Device Admins are listed.
2013-06-06 15:32:00 -07:00
Alex Klyubin
8d5aeffa7d
am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
...
* commit '089d161588f07862ac1e8876a39227e4110b2bec':
Permit deactivation of malformed Device Admins.
2013-06-06 15:29:56 -07:00
Alex Klyubin
9f6a193394
am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed.
...
* commit '0ffbbad5b1ad34bb2add06f7ec030191ed94e866':
Ensure all active Device Admins are listed.
2013-06-06 15:29:56 -07:00
Alex Klyubin
089d161588
am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
...
* commit '01dbfbf9c3e14253b7c3a2e822c55c013d0e4b17':
Permit deactivation of malformed Device Admins.
2013-06-06 15:28:53 -07:00
Alex Klyubin
0ffbbad5b1
am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed.
...
* commit '60544e74b689c5c9e6e47e6b1c50582fe37d0a70':
Ensure all active Device Admins are listed.
2013-06-06 15:28:52 -07:00
Alex Klyubin
01dbfbf9c3
am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
...
* commit 'efd88e2c468db2169ff9bb17f2b89c246756dcda':
Permit deactivation of malformed Device Admins.
2013-06-06 15:26:49 -07:00