Bill Yi
|
fc4fb60597
|
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: f315e2e6f0 -s ours
am: 440199c6c4 -s ours
Change-Id: I09f6c8d03838d659c42ef85c2a201258679346ef
|
2016-06-21 17:02:49 +00:00 |
|
Bill Yi
|
9cfd92d7d8
|
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: f315e2e6f0 -s ours
am: 672e1ddb14 -s ours
Change-Id: Ia75f957c8348a0562d7941220b8a796fe57d363d
|
2016-06-21 16:58:10 +00:00 |
|
Bill Yi
|
475d022e59
|
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 5903be35f4 -s ours
Change-Id: I12bdb0e46f4401413a38b8b699e464929e88f504
|
2016-06-21 16:58:09 +00:00 |
|
Bill Yi
|
440199c6c4
|
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: f315e2e6f0 -s ours
Change-Id: I2b7c6b292d8197f588fca6dc8c05a329e58d6733
|
2016-06-21 16:56:45 +00:00 |
|
Bill Yi
|
672e1ddb14
|
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: f315e2e6f0 -s ours
Change-Id: I8216d1ead0653fff4d1a335f11ff92879d587fcc
|
2016-06-21 16:56:44 +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
|
f315e2e6f0
|
Merge "Import translations. DO NOT MERGE" into nyc-dev
|
2016-06-21 16:53:26 +00:00 |
|
Sunny Goyal
|
6f38bd7620
|
Merge \"Adding custom manifest shortcuts in Settings app\" into nyc-mr1-dev
am: 139fbb78b5
Change-Id: I0dbe76be67dfe27f7e0a28d6a2eeb7da97cec19a
|
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
|
3659d42b32
|
Fix non-app non-user preferences in Settings > Data usage am: afea1cae25
am: e341462a50
Change-Id: Idc9d5d2381b7c33cedc6b3d1e8bac1776b3ab1e9
|
2016-06-21 16:00:35 +00:00 |
|
Zoltan Szatmary-Ban
|
e341462a50
|
Fix non-app non-user preferences in Settings > Data usage
am: afea1cae25
Change-Id: I55e991f5cd9c39a740dd62945fe113ee59ea18a9
|
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
Change-Id: Iabfb95c0b071b8ebe2ab8a659d323a9cda2656d5
|
2016-06-21 15:55:07 +00:00 |
|
Zoltan Szatmary-Ban
|
63170fbf7a
|
Fix non-app non-user preferences in Settings > Data usage
am: afea1cae25
Change-Id: I09905ec152a16e12436927bd514fb6cbe5afb59a
|
2016-06-21 15:52:33 +00:00 |
|
Fan Zhang
|
1b6d911793
|
Merge \"Log button taps in support tab.\" into nyc-mr1-dev
am: a2fe136837
Change-Id: I661ffe3744f44e69e886e8f5a825304f2c022d4b
|
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 |
|
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 |
|
Bill Yi
|
2d85beec1e
|
Import translations. DO NOT MERGE
Change-Id: Iebfc06a928c222879aceec01c3aaf35f2cf78561
Auto-generated-cl: translation import
|
2016-06-21 04:28:46 -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
|
f2495079ed
|
Merge \\"Fix NPE printing notification actions.\\" into nyc-dev am: 43b04bcc7d
am: 07e85aa5c0
Change-Id: I409fd02854876c68e004cdb62500fdbaffd4085d
|
2016-06-20 19:18:31 +00:00 |
|
Julia Reynolds
|
4606b359e9
|
Merge \\"Fix NPE printing notification actions.\\" into nyc-dev am: 43b04bcc7d
am: 018444ab61
Change-Id: I1946b95fd5ccf8e4506b452998c478c2781d3e3a
|
2016-06-20 19:12:14 +00:00 |
|
Julia Reynolds
|
018444ab61
|
Merge \"Fix NPE printing notification actions.\" into nyc-dev
am: 43b04bcc7d
Change-Id: I427adea08ff2a9f50c0d54329ae1b5adcca508c8
|
2016-06-20 19:08:43 +00:00 |
|
Julia Reynolds
|
07e85aa5c0
|
Merge \"Fix NPE printing notification actions.\" into nyc-dev
am: 43b04bcc7d
Change-Id: I2763437122129654485c80b7652729526042321a
|
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
|
ea8e259e42
|
Fix focusability of battery history chart am: 9c6ab88bd7
am: 5c3f9459e8
Change-Id: If0977bcf4fe63d0b14cb5e811ae37fab40f74446
|
2016-06-20 17:50:40 +00:00 |
|
Jason Monk
|
b6af413f8b
|
Fix focusability of battery history chart am: 9c6ab88bd7
am: b363eb89bc
Change-Id: Ibdb83d13677d9101264593e2220b9d18fc261fc9
|
2016-06-20 17:38:19 +00:00 |
|
Jason Monk
|
b363eb89bc
|
Fix focusability of battery history chart
am: 9c6ab88bd7
Change-Id: I8239280074c191c98414e57c0c915463ade9ec9c
|
2016-06-20 17:29:24 +00:00 |
|
Jason Monk
|
5c3f9459e8
|
Fix focusability of battery history chart
am: 9c6ab88bd7
Change-Id: I11bace8b2417900056b4220e65c4e394adceb669
|
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
Change-Id: I25ff49cb0ce6ab6cb4cfb35aef254d3881e343e1
|
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
|
8008dee36c
|
Merge \"Hide \'Update Emergecy Address\' preference w/o carrier support\" into nyc-mr1-dev
am: 2a817d97fe
Change-Id: Iccf8008b7a818bf8327e8e53632326dd0dc41982
|
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
|
057f4ae6cc
|
Merge \"Use metrics defined by proto in new Settings tabs.\" into nyc-mr1-dev
am: b2728f51fb
Change-Id: I4dceebf40bc15302d2fea43cc733c64a04ca2fea
|
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
|
6bf5f1e84a
|
Merge \"Add handling for fingerprint swipe in gesture settings.\" into nyc-mr1-dev
am: b458f46438
Change-Id: I3ad94884053f7d3788c06ef7d75b4f40f7b46758
|
2016-06-17 18:20:38 +00:00 |
|
Doris Ling
|
b458f46438
|
Merge "Add handling for fingerprint swipe in gesture settings." into nyc-mr1-dev
|
2016-06-17 18:15:58 +00:00 |
|
Jason Monk
|
540f55b272
|
Merge \\"Protect against crash in memory details\\" into nyc-dev am: c3ec1ab889
am: ca26435ca0
Change-Id: Ib5c782a3044161923c91aa8b5fb1fa31dedc9b09
|
2016-06-17 17:55:04 +00:00 |
|
Jason Monk
|
108b3c2879
|
Make sure screen pinning desc is part of view hierarchy am: 0c2ccba2f9
am: 2ca05240fd
Change-Id: I8b2fb6adf8959d0504b17f8ad2a3c3f33a797da3
|
2016-06-17 17:55:03 +00:00 |
|
Jason Monk
|
ca26435ca0
|
Merge \"Protect against crash in memory details\" into nyc-dev
am: c3ec1ab889
Change-Id: If36b3350e0694ffae3086be9307295c4516828dd
|
2016-06-17 17:52:01 +00:00 |
|
Jason Monk
|
2ca05240fd
|
Make sure screen pinning desc is part of view hierarchy
am: 0c2ccba2f9
Change-Id: Iac6d8d4df22fb8e32e61ad25aed06e079d1fa348
|
2016-06-17 17:52:01 +00:00 |
|
Jason Monk
|
07e52aeb1c
|
Merge \\"Protect against crash in memory details\\" into nyc-dev am: c3ec1ab889
am: 989a52dc8d
Change-Id: I09960da265e426c58fc651d3c9b932f20633f1fb
|
2016-06-17 17:47:25 +00:00 |
|
Jason Monk
|
ac0b7dd4e7
|
Make sure screen pinning desc is part of view hierarchy am: 0c2ccba2f9
am: 11bad8d93e
Change-Id: I1235d2ae35600c71f92d69f1f4475a3b70efeef1
|
2016-06-17 17:47:25 +00:00 |
|
Jason Monk
|
989a52dc8d
|
Merge \"Protect against crash in memory details\" into nyc-dev
am: c3ec1ab889
Change-Id: I64ec49c820c21971056b342908a1e0c33d394d72
|
2016-06-17 17:44:25 +00:00 |
|
Jason Monk
|
11bad8d93e
|
Make sure screen pinning desc is part of view hierarchy
am: 0c2ccba2f9
Change-Id: I20e98baa0be229a72673ef18eccd35bc713f75ad
|
2016-06-17 17:44:25 +00:00 |
|
Jason Monk
|
c3ec1ab889
|
Merge "Protect against crash in memory details" into nyc-dev
|
2016-06-17 17:22:03 +00:00 |
|
Adrian Roos
|
1e26d10308
|
resolve merge conflicts of 333ba2d to nyc-mr1-dev
am: bd470255d0
Change-Id: I8013125ea8560c8d0b0cd972536316a394859cca
|
2016-06-17 17:10:17 +00:00 |
|