Baligh Uddin
|
a38fac3b8d
|
Import translations. DO NOT MERGE
Change-Id: I29410b46882d22f35d29bb82bcbffeab31aa11ee
Auto-generated-cl: translation import
|
2013-07-10 20:33:24 -07:00 |
|
Dianne Hackborn
|
1dd1a9363f
|
Merge "Update to show new location monitoring op."
|
2013-07-10 18:46:04 +00:00 |
|
Brian Carlstrom
|
f32ba13a76
|
Add developer option for switching between Dalvik and ART
Change-Id: Ia5a8649e52b607b31429fca258a8fdf62217426c
|
2013-07-10 09:49:07 -07:00 |
|
Dianne Hackborn
|
15ab7758df
|
Update to show new location monitoring op.
Change-Id: I921e95327c743c5b9b89bfe5a94beca67bfdb7de
|
2013-07-09 18:50:44 -07:00 |
|
Amith Yamasani
|
9333cc7de5
|
Add the edit text style for tablets to fix layout issue
Bug: 9556589
Change-Id: If9443b2ce10782aeb266e87fbeafa74e158121cd
|
2013-07-09 17:06:58 -07:00 |
|
Amith Yamasani
|
95b4cb5765
|
Merge "Fix accidental creation of restriction entry for required apps"
|
2013-07-09 18:33:55 +00:00 |
|
Amith Yamasani
|
9e9c77c130
|
Fix accidental creation of restriction entry for required apps
When entering Settings->Restrictions, don't automatically query restriction entries
for required apps.
Bug: 9681399
Change-Id: Idcc773bf4793b3e7e2b328a15881b7ecf930c6c3
|
2013-07-09 11:28:40 -07:00 |
|
The Android Open Source Project
|
f9ee312b4e
|
am ff2b0d7f: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit 'ff2b0d7f79283665ad3d1fee8a96b3455be7f91d':
|
2013-07-08 15:48:50 -07:00 |
|
The Android Open Source Project
|
ff2b0d7f79
|
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I5b0a5ed28f84d9e080f30feeec05975512a8b8f7
|
2013-07-08 15:37:19 -07:00 |
|
Baligh Uddin
|
c541fcbf60
|
am 18119223: (-s ours) am 55077df1: am f1d02056: Import translations. DO NOT MERGE
* commit '181192235d02e647a161a18ff442367ca8fe7f8f':
Import translations. DO NOT MERGE
|
2013-07-08 14:40:59 -07:00 |
|
Baligh Uddin
|
82a1d34e6c
|
am 369ca5a7: (-s ours) am 20a554fa: Import translations. DO NOT MERGE
* commit '369ca5a7b07963a77ab2f7c323a552d2c247b401':
Import translations. DO NOT MERGE
|
2013-07-08 14:40:58 -07:00 |
|
Baligh Uddin
|
181192235d
|
am 55077df1: am f1d02056: Import translations. DO NOT MERGE
* commit '55077df18a9bc29171eeb1587ec6c84101e6fa64':
Import translations. DO NOT MERGE
|
2013-07-08 14:38:21 -07:00 |
|
Baligh Uddin
|
369ca5a7b0
|
am 20a554fa: Import translations. DO NOT MERGE
* commit '20a554fa50620fc51951a12f16a27f83168f4ce3':
Import translations. DO NOT MERGE
|
2013-07-08 14:38:18 -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
|
12c8b64cdc
|
Import translations. DO NOT MERGE
Change-Id: I4f9e9eb6205bd1f638de95696b63e0fb9ec42e83
Auto-generated-cl: translation import
|
2013-07-08 09:22:36 -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 |
|
The Android Automerger
|
f71e502149
|
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
|
2013-07-08 05:55:42 -07:00 |
|
The Android Open Source Project
|
f98ac485e3
|
am d8e00a0b: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit 'd8e00a0ba3993fde61a06623d901bf13705c353d':
|
2013-07-03 14:36:40 -07:00 |
|
The Android Open Source Project
|
d8e00a0ba3
|
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I1529161d81082d96363ffb02eab90da17a1ec71e
|
2013-07-03 14:33:10 -07:00 |
|
Baligh Uddin
|
6311d74296
|
am 143d4600: (-s ours) am 8bd9f2f2: am 76185f72: Import translations. DO NOT MERGE
* commit '143d4600276b43457ae12eaaa9c585ca2650a908':
Import translations. DO NOT MERGE
|
2013-07-03 14:30:01 -07:00 |
|
Baligh Uddin
|
26c165d8e4
|
am 7f49b198: (-s ours) am df0ad0dc: am aa03b2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '7f49b198d0f7477cf6a64e704260373b65ba71f4':
Import translations. DO NOT MERGE
|
2013-07-03 14:30:00 -07:00 |
|
Baligh Uddin
|
143d460027
|
am 8bd9f2f2: am 76185f72: Import translations. DO NOT MERGE
* commit '8bd9f2f287dec8ff9abb4de1830a1a91fc7212c2':
Import translations. DO NOT MERGE
|
2013-07-03 14:27:40 -07:00 |
|
Baligh Uddin
|
7f49b198d0
|
am df0ad0dc: am aa03b2f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit 'df0ad0dc86b41b009943f97956b7a36b00c9eef8':
Import translations. DO NOT MERGE
|
2013-07-03 14:27:39 -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
|
a0387518c9
|
am 8db7a8c5: (-s ours) am ad965c17: Import translations. DO NOT MERGE
* commit '8db7a8c58e6732f0a7341657ff162ff49d031ebd':
Import translations. DO NOT MERGE
|
2013-07-03 14:22:20 -07:00 |
|
Baligh Uddin
|
8db7a8c58e
|
am ad965c17: Import translations. DO NOT MERGE
* commit 'ad965c173bd5a6f98d14a6e1ef83087cc55bd5ef':
Import translations. DO NOT MERGE
|
2013-07-03 14:21:03 -07:00 |
|
Baligh Uddin
|
a5c0091071
|
Import translations. DO NOT MERGE
Change-Id: If98562e409c4046b37b8b1a92b171e222403233f
Auto-generated-cl: translation import
|
2013-07-03 13:59:41 -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
|
19e598acf0
|
am daa0e5ab: (-s ours) am e462f0d5: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit 'daa0e5ab7acca1d96278c416ce0060524507af01':
Import translations. DO NOT MERGE
|
2013-07-02 12:41:23 -07:00 |
|
Baligh Uddin
|
daa0e5ab7a
|
am e462f0d5: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit 'e462f0d5b9b131523240795c23dc6ec39fb19306':
Import translations. DO NOT MERGE
|
2013-07-02 12:33:11 -07:00 |
|
Baligh Uddin
|
786cdbd36f
|
Merge "Import translations. DO NOT MERGE"
|
2013-07-02 16:35:06 +00: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 |
|
The Android Automerger
|
959821a098
|
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
|
2013-07-02 05:55:33 -07:00 |
|
Wink Saville
|
41f3c55226
|
am 17f1fa42: am 7319f2b1: am 5d5a269f: Add Manage mobile plan to Settings.
* commit '17f1fa4207e45276a11e52bbc65dc26a25911006':
Add Manage mobile plan to Settings.
|
2013-07-01 17:01:28 -07:00 |
|
Wink Saville
|
17f1fa4207
|
am 7319f2b1: am 5d5a269f: Add Manage mobile plan to Settings.
* commit '7319f2b123772d72417cd09e8f3f04441c93d13d':
Add Manage mobile plan to Settings.
|
2013-07-01 16:33:01 -07: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 |
|
Baligh Uddin
|
30dd3dc34f
|
Import translations. DO NOT MERGE
Change-Id: I9fab5b88800615e150968d8b664b1553b808f399
Auto-generated-cl: translation import
|
2013-07-01 09:24:12 -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 |
|
The Android Open Source Project
|
c40e5ffff9
|
am 6ab277ee: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '6ab277ee50d91bb6b50cacda55e84ac3afc4323b':
|
2013-07-01 07:47:44 -07:00 |
|
The Android Open Source Project
|
6ab277ee50
|
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I6534b46c13c3ae03f703e70a546f54a59fc4adc0
|
2013-07-01 07:43:20 -07:00 |
|
The Android Automerger
|
1468b78605
|
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
|
2013-06-30 05:55:34 -07:00 |
|
Amith Yamasani
|
902d1bc484
|
Merge "Don't start the loader task if one is already running"
|
2013-06-28 22:35:54 +00:00 |
|
Amith Yamasani
|
ab72687b15
|
Don't start the loader task if one is already running
This should appease the monkeys.
Bug: 9619255
Change-Id: Idbac0bd86acafbdb636b0b18e09fcbb9eea15cc4
|
2013-06-28 15:30:08 -07:00 |
|
Robert Greenwalt
|
7a2466b511
|
am 50702355: am 5d3ef571: am a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode"
* commit '50702355f23d5e270727018c2af7cc76a1bd91eb':
Dont enable Wi-Fi if it's not toggleable in flight mode
|
2013-06-28 10:48:40 -07:00 |
|