Bill Yi
7d56ca0f98
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 5903be35f4 -s ours
...
am: 475d022e59
2016-06-21 17:00:43 +00:00
Bill Yi
475d022e59
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
...
am: 5903be35f4
2016-06-21 16:58:09 +00:00
TreeHugger Robot
5903be35f4
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-06-21 16:53:39 +00:00
TreeHugger Robot
f11d06991a
Merge "Import translations. DO NOT MERGE"
2016-06-21 16:53:16 +00:00
Sunny Goyal
bcfe8e8d95
Merge \\"Adding custom manifest shortcuts in Settings app\\" into nyc-mr1-dev am: 139fbb78b5
...
am: 6f38bd7620
2016-06-21 16:51:23 +00:00
Sunny Goyal
6f38bd7620
Merge \"Adding custom manifest shortcuts in Settings app\" into nyc-mr1-dev
...
am: 139fbb78b5
2016-06-21 16:48:12 +00:00
Sunny Goyal
139fbb78b5
Merge "Adding custom manifest shortcuts in Settings app" into nyc-mr1-dev
2016-06-21 16:39:33 +00:00
Zoltan Szatmary-Ban
be7aebdb9c
Fix non-app non-user preferences in Settings > Data usage am: afea1cae25 am: e341462a50
...
am: 3659d42b32
2016-06-21 16:03:42 +00:00
Zoltan Szatmary-Ban
3659d42b32
Fix non-app non-user preferences in Settings > Data usage am: afea1cae25
...
am: e341462a50
2016-06-21 16:00:35 +00:00
Zoltan Szatmary-Ban
cf945c47d2
Fix non-app non-user preferences in Settings > Data usage am: afea1cae25 am: 63170fbf7a
...
am: 3b629c6918
2016-06-21 15:57:49 +00:00
Zoltan Szatmary-Ban
e341462a50
Fix non-app non-user preferences in Settings > Data usage
...
am: afea1cae25
2016-06-21 15:57:08 +00:00
Zoltan Szatmary-Ban
3b629c6918
Fix non-app non-user preferences in Settings > Data usage am: afea1cae25
...
am: 63170fbf7a
2016-06-21 15:55:07 +00:00
Zoltan Szatmary-Ban
63170fbf7a
Fix non-app non-user preferences in Settings > Data usage
...
am: afea1cae25
2016-06-21 15:52:33 +00:00
Fan Zhang
881685d6d1
Merge \\"Log button taps in support tab.\\" into nyc-mr1-dev am: a2fe136837
...
am: 1b6d911793
2016-06-21 15:47:29 +00:00
Fan Zhang
1b6d911793
Merge \"Log button taps in support tab.\" into nyc-mr1-dev
...
am: a2fe136837
2016-06-21 15:35:07 +00:00
Fan Zhang
a2fe136837
Merge "Log button taps in support tab." into nyc-mr1-dev
2016-06-21 15:28:31 +00:00
Robin Lee
140ad39fb0
Merge "Don't show always-on option connecting PPTP vpn"
2016-06-21 13:53:20 +00:00
Zoltan Szatmary-Ban
afea1cae25
Fix non-app non-user preferences in Settings > Data usage
...
Bug:29466113
Change-Id: Ib7a6d477146a856c0cb9c49143ffbf4fb99e38ed
2016-06-21 12:57:30 +01:00
Bill Yi
efd819e862
Import translations. DO NOT MERGE
...
Change-Id: Ia258f44583c5690bd396d20517e1309807c659ad
Auto-generated-cl: translation import
2016-06-21 04:40:02 -07:00
Robin Lee
ca75deb7af
Don't show always-on option connecting PPTP vpn
...
Support for this kind has been taken out so it shouldn't be an option
when connecting (it's already not an option when editing).
Bug: 28807474
Change-Id: Id3e7be390c6813d091e7f897ac82aaf29042beb8
2016-06-21 12:24:33 +01:00
Bill Yi
c1db3d0c31
Import translations. DO NOT MERGE
...
Change-Id: I329f068208298bdb3cfdd4370e33cd9e2886298c
Auto-generated-cl: translation import
2016-06-21 03:52:26 -07:00
Sunny Goyal
5f179fcef1
Adding custom manifest shortcuts in Settings app
...
Bug:28298258
Change-Id: Ie7fd86a999fa2abe2522adfb29573b86f36db3a5
2016-06-20 16:44:17 -07:00
Julia Reynolds
03eb9afe99
Merge \\\"Fix NPE printing notification actions.\\\" into nyc-dev am: 43b04bcc7d am: 07e85aa5c0
...
am: f2495079ed
2016-06-20 19:20:19 +00:00
Julia Reynolds
8dc40b87a7
Merge \\\"Fix NPE printing notification actions.\\\" into nyc-dev am: 43b04bcc7d am: 018444ab61
...
am: 4606b359e9
2016-06-20 19:20:17 +00:00
Julia Reynolds
f2495079ed
Merge \\"Fix NPE printing notification actions.\\" into nyc-dev am: 43b04bcc7d
...
am: 07e85aa5c0
2016-06-20 19:18:31 +00:00
Julia Reynolds
4606b359e9
Merge \\"Fix NPE printing notification actions.\\" into nyc-dev am: 43b04bcc7d
...
am: 018444ab61
2016-06-20 19:12:14 +00:00
Julia Reynolds
018444ab61
Merge \"Fix NPE printing notification actions.\" into nyc-dev
...
am: 43b04bcc7d
2016-06-20 19:08:43 +00:00
Julia Reynolds
07e85aa5c0
Merge \"Fix NPE printing notification actions.\" into nyc-dev
...
am: 43b04bcc7d
2016-06-20 18:58:07 +00:00
Julia Reynolds
43b04bcc7d
Merge "Fix NPE printing notification actions." into nyc-dev
2016-06-20 18:43:04 +00:00
Jason Monk
1fe6037481
Fix focusability of battery history chart am: 9c6ab88bd7 am: 5c3f9459e8
...
am: ea8e259e42
2016-06-20 17:57:06 +00:00
Jason Monk
0ceacec553
Fix focusability of battery history chart am: 9c6ab88bd7 am: b363eb89bc
...
am: b6af413f8b
2016-06-20 17:57:05 +00:00
Jason Monk
ea8e259e42
Fix focusability of battery history chart am: 9c6ab88bd7
...
am: 5c3f9459e8
2016-06-20 17:50:40 +00:00
Jason Monk
b6af413f8b
Fix focusability of battery history chart am: 9c6ab88bd7
...
am: b363eb89bc
2016-06-20 17:38:19 +00:00
Fan Zhang
a659b1110a
Merge \\"Add a \\"Do not show\\" checkbox in support disclaimer dialog.\\" into nyc-mr1-dev am: d04b49649e
...
am: 461b286de7
2016-06-20 17:36:22 +00:00
Jason Monk
b363eb89bc
Fix focusability of battery history chart
...
am: 9c6ab88bd7
2016-06-20 17:29:24 +00:00
Jason Monk
5c3f9459e8
Fix focusability of battery history chart
...
am: 9c6ab88bd7
2016-06-20 17:26:42 +00:00
Fan Zhang
ab2e0390a0
Log button taps in support tab.
...
Bug: 29282762
Change-Id: I7d573f95450292840413cb5e266915f64f6d667d
2016-06-20 10:26:20 -07:00
Fan Zhang
461b286de7
Merge \"Add a \"Do not show\" checkbox in support disclaimer dialog.\" into nyc-mr1-dev
...
am: d04b49649e
2016-06-20 17:25:45 +00:00
Fan Zhang
d04b49649e
Merge "Add a "Do not show" checkbox in support disclaimer dialog." into nyc-mr1-dev
2016-06-20 16:35:52 +00:00
Jason Monk
9c6ab88bd7
Fix focusability of battery history chart
...
Change-Id: I0bd0da84a08ed6e3c51da3dc6a68e878c5c0d3cd
Fixes: 29453492
2016-06-20 11:04:43 -04:00
Julia Reynolds
9bcc04c5db
Fix NPE printing notification actions.
...
Change-Id: Icb52e7bc632bf7109a75a7695fb253b2183e7360
Fixes: 29017025
2016-06-20 10:23:44 -04:00
Meng Wang
ffb4f8a058
Merge \\"Hide \\'Update Emergecy Address\\' preference w/o carrier support\\" into nyc-mr1-dev am: 2a817d97fe
...
am: 8008dee36c
2016-06-18 04:15:55 +00:00
Meng Wang
8008dee36c
Merge \"Hide \'Update Emergecy Address\' preference w/o carrier support\" into nyc-mr1-dev
...
am: 2a817d97fe
2016-06-18 04:12:40 +00:00
TreeHugger Robot
2a817d97fe
Merge "Hide 'Update Emergecy Address' preference w/o carrier support" into nyc-mr1-dev
2016-06-18 04:02:49 +00:00
Fan Zhang
39d2e1f916
resolve merge conflicts of 057f4ae to master
...
Change-Id: I609b04b174195b2396ee5918990b03d737ad0067
2016-06-17 15:40:48 -07:00
Fan Zhang
057f4ae6cc
Merge \"Use metrics defined by proto in new Settings tabs.\" into nyc-mr1-dev
...
am: b2728f51fb
2016-06-17 20:20:54 +00:00
Fan Zhang
b2728f51fb
Merge "Use metrics defined by proto in new Settings tabs." into nyc-mr1-dev
2016-06-17 20:15:48 +00:00
Fan Zhang
0beb695999
Add a "Do not show" checkbox in support disclaimer dialog.
...
Bug: 28762823
Change-Id: I8fe0a82efbb47c8b2f9e34480005fa108583b203
2016-06-17 12:56:35 -07:00
Doris Ling
a617c80bac
Merge \\"Add handling for fingerprint swipe in gesture settings.\\" into nyc-mr1-dev am: b458f46438
...
am: 6bf5f1e84a
2016-06-17 18:56:11 +00:00
Jason Monk
6de5d6c5f2
Merge \\\"Protect against crash in memory details\\\" into nyc-dev am: c3ec1ab889 am: ca26435ca0
...
am: 540f55b272
2016-06-17 18:56:10 +00:00
