OSDN Git Service
Bill Yi [Fri, 24 Jun 2016 06:34:34 +0000 (06:34 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
5bb180388a -s ours
am:
1072cc1175 -s ours
Change-Id: I63a62b20953668ba82cf05387041cfa8b1d2e0bb
Bill Yi [Fri, 24 Jun 2016 06:30:26 +0000 (06:30 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
5bb180388a -s ours
Change-Id: I13908cbf3a74b215e12c271642722424470e30c6
TreeHugger Robot [Fri, 24 Jun 2016 06:22:56 +0000 (06:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 24 Jun 2016 05:02:51 +0000 (22:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I99973d29e54e0ccd4d0ec2e3e631f0d7d8f57c8a
Auto-generated-cl: translation import
Android Build Merger (Role) [Fri, 24 Jun 2016 01:20:23 +0000 (01:20 +0000)]
Merge "Don\\'t toggle Data Saver again until it receives a callback. am:
484caa3035 am:
a6ec072541" into nyc-mr1-dev-plus-aosp
Felipe Leme [Fri, 24 Jun 2016 01:20:15 +0000 (01:20 +0000)]
Don\\'t toggle Data Saver again until it receives a callback. am:
484caa3035
am:
a6ec072541
Change-Id: Ia790b33199dd537baf36455956864d39535bcc77
Felipe Leme [Fri, 24 Jun 2016 01:20:02 +0000 (01:20 +0000)]
Don\\'t toggle Data Saver again until it receives a callback. am:
484caa3035
am:
78756838a7
Change-Id: I4c8b69abdfeb740aac87f70cf4c3e305984cb557
Felipe Leme [Fri, 24 Jun 2016 01:16:29 +0000 (01:16 +0000)]
Don\'t toggle Data Saver again until it receives a callback.
am:
484caa3035
Change-Id: Ib81e52c99e227318a3575c1d7bf03ffd36ce1f74
Felipe Leme [Fri, 24 Jun 2016 01:15:45 +0000 (01:15 +0000)]
Don\'t toggle Data Saver again until it receives a callback.
am:
484caa3035
Change-Id: Ib4b48a02015b81791d5bb77242968ca7c66b0621
Felipe Leme [Thu, 23 Jun 2016 22:18:11 +0000 (15:18 -0700)]
Don't toggle Data Saver again until it receives a callback.
BUG:
29253107
Change-Id: I4371f947086a45be6709d2a560d27d1f5f0e79c4
Christine Hallstrom [Thu, 23 Jun 2016 20:53:59 +0000 (20:53 +0000)]
Log whether BT pairing dialog is accepted or canceled
am:
ac47013154
Change-Id: I09bdaf679b490bfb361c1648a8eee9f57db8b566
Christine Hallstrom [Wed, 22 Jun 2016 22:46:35 +0000 (15:46 -0700)]
Log whether BT pairing dialog is accepted or canceled
Change-Id: I584cef273f16e27cd7e569b53abccedfe0bd0af7
Jack Yu [Thu, 23 Jun 2016 18:45:17 +0000 (18:45 +0000)]
Merge \"Added multi sim support back for brazil channel 50 messages.\" into nyc-mr1-dev
am:
f0c929017f
Change-Id: I49f1729d081f834715066ab690f8ca8808aa6f61
Andrew Sapperstein [Thu, 23 Jun 2016 18:45:03 +0000 (18:45 +0000)]
Merge \"Use colorSecondary for switch bar backgrounds.\" into nyc-mr1-dev
am:
da926355c0
Change-Id: I0f5a0fe312bb922ddeb709e1bf480f2d03fcd27d
Jack Yu [Thu, 23 Jun 2016 18:41:21 +0000 (18:41 +0000)]
Merge "Added multi sim support back for brazil channel 50 messages." into nyc-mr1-dev
Andrew Sapperstein [Thu, 23 Jun 2016 18:37:40 +0000 (18:37 +0000)]
Merge "Use colorSecondary for switch bar backgrounds." into nyc-mr1-dev
Fan Zhang [Thu, 23 Jun 2016 17:38:23 +0000 (17:38 +0000)]
Merge \"Display operation hours when support is closed.\" into nyc-mr1-dev
am:
c3a0a18f77
Change-Id: I85feefab029eeb7e7101ec7f25e28d3653b07852
Fan Zhang [Thu, 23 Jun 2016 17:38:20 +0000 (17:38 +0000)]
Merge \"Bug fix: support tab doesn\'t show offline UI initially.\" into nyc-mr1-dev
am:
2373aaafc6
Change-Id: I226b76f8d69ff25327c9043609bb923a13feab7b
Fan Zhang [Thu, 23 Jun 2016 17:27:10 +0000 (17:27 +0000)]
Merge "Display operation hours when support is closed." into nyc-mr1-dev
Fan Zhang [Thu, 23 Jun 2016 17:25:22 +0000 (17:25 +0000)]
Merge "Bug fix: support tab doesn't show offline UI initially." into nyc-mr1-dev
Fan Zhang [Thu, 23 Jun 2016 15:38:00 +0000 (08:38 -0700)]
Bug fix: support tab doesn't show offline UI initially.
Bug:
29601818
The support UI correctly monitors network state change after being
displayed, but it fails to set initial hasInternet flag. So we
manually refresh this flag as part of onResume.
Change-Id: Icbf3cca708a961390073cfa77ec08bec7dd4d82f
Andrew Sapperstein [Thu, 23 Jun 2016 02:58:17 +0000 (02:58 +0000)]
Merge \"Flip default value for nav key setting.\" into nyc-mr1-dev
am:
742047f565
Change-Id: Id8aeaac79e142f81daecde2379e36ed77c0ba14c
TreeHugger Robot [Thu, 23 Jun 2016 02:51:44 +0000 (02:51 +0000)]
Merge "Flip default value for nav key setting." into nyc-mr1-dev
Daniel Nishi [Thu, 23 Jun 2016 01:48:55 +0000 (01:48 +0000)]
Re-add a string to fix a build breakage.
am:
be42f8bb61
Change-Id: I569479a635f407427a1877724d25101dde77602f
Daniel Nishi [Thu, 23 Jun 2016 01:41:04 +0000 (18:41 -0700)]
Re-add a string to fix a build breakage.
Change-Id: I079a5643634ffbf68f9414c639a9aba4a8a67d75
Andrew Sapperstein [Thu, 23 Jun 2016 01:04:50 +0000 (18:04 -0700)]
Flip default value for nav key setting.
It's on by default.
BUG:
28565958
BUG:
29550614
Change-Id: I3bec47f9f495bfec946f09d314407e6b48672b0a
Andrew Sapperstein [Thu, 23 Jun 2016 00:35:07 +0000 (00:35 +0000)]
Merge \"Flip default values of two gesture settings.\" into nyc-mr1-dev
am:
399251a0e7
Change-Id: Ifeb432500939cee04201b3ea464f84d2a269b970
Andrew Sapperstein [Thu, 23 Jun 2016 00:29:25 +0000 (00:29 +0000)]
Merge "Flip default values of two gesture settings." into nyc-mr1-dev
Jack Yu [Thu, 23 Jun 2016 00:11:19 +0000 (17:11 -0700)]
Added multi sim support back for brazil channel 50 messages.
Reverted the MSIM removeal CL ag/825835.
bug:
28787384
Change-Id: I2f3691a83c117c2f01a78788d6e95e51a314d51f
Meng Wang [Thu, 23 Jun 2016 00:07:10 +0000 (00:07 +0000)]
Merge \"WifiCallingSettings: UI improvement\" into nyc-mr1-dev
am:
d70ebc7bc4
Change-Id: I717bf769eb87112f46c0a4d01c212794212036af
TreeHugger Robot [Thu, 23 Jun 2016 00:04:41 +0000 (00:04 +0000)]
Merge "WifiCallingSettings: UI improvement" into nyc-mr1-dev
Daniel Nishi [Wed, 22 Jun 2016 23:59:02 +0000 (23:59 +0000)]
Merge \"Remove the Deletion Helper and Automatic Storage Management jobs.\" into nyc-mr1-dev
am:
de17410d37
Change-Id: I8b7cc9e6b3f6579f0ea0ebca827967a39a562697
Daniel Nishi [Wed, 22 Jun 2016 23:52:22 +0000 (23:52 +0000)]
Merge "Remove the Deletion Helper and Automatic Storage Management jobs." into nyc-mr1-dev
Nathan Harold [Wed, 22 Jun 2016 23:26:50 +0000 (23:26 +0000)]
Merge \"Add Debug Toggles for Video and WiFI Calling Provisioning\" into nyc-mr1-dev
am:
d63c3e7854
Change-Id: I64b93ca2cd6faef81023c6b196cac16a09c247b4
Nathan Harold [Wed, 22 Jun 2016 23:20:08 +0000 (23:20 +0000)]
Merge "Add Debug Toggles for Video and WiFI Calling Provisioning" into nyc-mr1-dev
Doris Ling [Wed, 22 Jun 2016 20:37:01 +0000 (20:37 +0000)]
Merge \"Make MasterClear a valid entry fragment.\" into nyc-mr1-dev
am:
44ce9aefbf
Change-Id: I7a1b3604bc05718249c532f142c9de45f0c515f7
Doris Ling [Wed, 22 Jun 2016 20:29:15 +0000 (20:29 +0000)]
Merge "Make MasterClear a valid entry fragment." into nyc-mr1-dev
Jason Monk [Wed, 22 Jun 2016 19:55:41 +0000 (19:55 +0000)]
Merge \\"Workaround to avoid crash in user photo selection\\" into nyc-dev am:
8f75abf92f
am:
34adfc533c
Change-Id: I2f28f41e52f24f4c64f96510236eda6d02a36037
Jason Monk [Wed, 22 Jun 2016 19:52:32 +0000 (19:52 +0000)]
Merge \\"Workaround to avoid crash in user photo selection\\" into nyc-dev am:
8f75abf92f
am:
4c33973714
Change-Id: Ieaa97e10d4e0173b74bb0015aa5c646857b92145
Jason Monk [Wed, 22 Jun 2016 19:50:01 +0000 (19:50 +0000)]
Merge \"Workaround to avoid crash in user photo selection\" into nyc-dev
am:
8f75abf92f
Change-Id: Ic0378c50fdc7661e76eed36acc9e935351998f04
Jason Monk [Wed, 22 Jun 2016 19:50:01 +0000 (19:50 +0000)]
Merge \"Workaround to avoid crash in user photo selection\" into nyc-dev
am:
8f75abf92f
Change-Id: Id340d94a65ed656ad003ea310d2c5c476a840999
Meng Wang [Wed, 22 Jun 2016 17:26:40 +0000 (10:26 -0700)]
WifiCallingSettings: UI improvement
Hide 'Update Emergency Address' on resume w/o carrier support
Bug:
29256401
Change-Id: I69f1d533c49614401767832bd502a732699aef22
Jason Monk [Wed, 22 Jun 2016 19:45:07 +0000 (19:45 +0000)]
Merge "Workaround to avoid crash in user photo selection" into nyc-dev
Android Build Merger (Role) [Wed, 22 Jun 2016 19:12:05 +0000 (19:12 +0000)]
Merge "Merge \\"Protect against crash in font size\\" into nyc-dev am:
4b336099f1 am:
b48664b9d1" into nyc-mr1-dev-plus-aosp
Jason Monk [Wed, 22 Jun 2016 19:11:54 +0000 (19:11 +0000)]
Merge \\"Protect against crash in font size\\" into nyc-dev am:
4b336099f1
am:
bc1764f404
Change-Id: I0808298678eb25b603302c537ca8e9a667fae8bc
Jason Monk [Wed, 22 Jun 2016 19:11:54 +0000 (19:11 +0000)]
Merge \\"Protect against crash in font size\\" into nyc-dev am:
4b336099f1
am:
b48664b9d1
Change-Id: I87fc40652ece1584635d02e293254e975719cc1a
Jason Monk [Wed, 22 Jun 2016 19:09:28 +0000 (19:09 +0000)]
Merge \"Protect against crash in font size\" into nyc-dev
am:
4b336099f1
Change-Id: Ia77306b83425ab46a33c6d8aa386adb5c52f3da5
Jason Monk [Wed, 22 Jun 2016 19:09:27 +0000 (19:09 +0000)]
Merge \"Protect against crash in font size\" into nyc-dev
am:
4b336099f1
Change-Id: Ida2f0e275cea74516616374b858816f162f76dd3
Jason Monk [Wed, 22 Jun 2016 19:04:16 +0000 (19:04 +0000)]
Merge "Protect against crash in font size" into nyc-dev
Doris Ling [Wed, 22 Jun 2016 01:08:22 +0000 (18:08 -0700)]
Make MasterClear a valid entry fragment.
Add FactoryResetActivity that maps to MasterClear fragment, and add
MasterClear to SettingsActivity's ENTRY_FRAGMENTS so that the
factory data reset fragment can be launched from activity alias.
Bug:
29405129
Change-Id: I8eca6b857987792da8d8678d33e6ab9d4e10793a
Jason Monk [Wed, 22 Jun 2016 18:46:56 +0000 (14:46 -0400)]
Workaround to avoid crash in user photo selection
Bug:
29556966
Change-Id: I0715dee2a4cef2252b4ed1cc4d242b8b3d0ab45c
Doris Ling [Wed, 22 Jun 2016 17:40:30 +0000 (17:40 +0000)]
Merge \"Remove summary text for Backup & reset.\" into nyc-mr1-dev
am:
e15eb0a263
Change-Id: Ic296e7c997f417a19e06ef782e87837b3066e2dd
Doris Ling [Wed, 22 Jun 2016 17:27:24 +0000 (17:27 +0000)]
Merge "Remove summary text for Backup & reset." into nyc-mr1-dev
Jason Monk [Wed, 22 Jun 2016 17:10:25 +0000 (13:10 -0400)]
Protect against crash in font size
Change-Id: Ib3578e0e82388a4f6aa3eeade0d990fc107b9c14
Fixes:
29438848
Fan Zhang [Mon, 20 Jun 2016 19:34:03 +0000 (12:34 -0700)]
Display operation hours when support is closed.
Bug:
29105266
Change-Id: Id451b1aa820961fad4ece07fde5782a5aecaee68
Jason Monk [Wed, 22 Jun 2016 15:37:26 +0000 (15:37 +0000)]
Merge \\"Fix tethering re-enable after edit.\\" into nyc-dev am:
dbb5a0b918
am:
cd2d94b2d1
Change-Id: Ifa46a3dce735778e99c115ac6499c71d05a2068b
Jason Monk [Wed, 22 Jun 2016 15:36:36 +0000 (15:36 +0000)]
Merge \"Fix tethering re-enable after edit.\" into nyc-dev
am:
dbb5a0b918
Change-Id: Ia9f2e65710a94f314f8bb2b8ec875088c9ccc59f
Jason Monk [Wed, 22 Jun 2016 15:29:14 +0000 (15:29 +0000)]
Merge \\"Fix tethering re-enable after edit.\\" into nyc-dev am:
dbb5a0b918
am:
c04ac8415a
Change-Id: I130760913149185f5cef084d9a239ad35a4fad04
Jason Monk [Wed, 22 Jun 2016 15:26:29 +0000 (15:26 +0000)]
Merge \"Fix tethering re-enable after edit.\" into nyc-dev
am:
dbb5a0b918
Change-Id: Ib8547ccf2a169c16b6bb0785e7094edbee123af0
Jason Monk [Wed, 22 Jun 2016 15:22:10 +0000 (15:22 +0000)]
Merge "Fix tethering re-enable after edit." into nyc-dev
Jason Monk [Wed, 22 Jun 2016 13:39:14 +0000 (13:39 +0000)]
Merge \\"Update battery content descriptions with labels\\" into nyc-dev am:
2a6b3d4db1
am:
a996a46c62
Change-Id: I8a942298ac1cda479cbed919b0000e7d8bb55ec1
Jason Monk [Wed, 22 Jun 2016 13:38:39 +0000 (13:38 +0000)]
Merge \\"Update battery content descriptions with labels\\" into nyc-dev am:
2a6b3d4db1
am:
29e4b2bc30
Change-Id: I018d46e214d2a56ecc0fca5b089bcd81dc6c7c41
Jason Monk [Wed, 22 Jun 2016 13:32:23 +0000 (13:32 +0000)]
Merge \"Update battery content descriptions with labels\" into nyc-dev
am:
2a6b3d4db1
Change-Id: I0e81816f4eb2e99b10d4cbb46d97f0a370159a6c
Jason Monk [Wed, 22 Jun 2016 13:32:21 +0000 (13:32 +0000)]
Merge \"Update battery content descriptions with labels\" into nyc-dev
am:
2a6b3d4db1
Change-Id: Id0d36f67615bd319351ba2bdc3c2993a3162e665
Jason Monk [Wed, 22 Jun 2016 13:22:45 +0000 (13:22 +0000)]
Merge "Update battery content descriptions with labels" into nyc-dev
Andrew Sapperstein [Wed, 22 Jun 2016 00:48:22 +0000 (17:48 -0700)]
Flip default values of two gesture settings.
The settings are enabled by default but the UI wasn't reflecting
that.
Change-Id: Ia321d12bcced4a7e2aa8c4a9fc0a0b7b3f5dad4a
FIXES:
29550614
Andrew Sapperstein [Tue, 21 Jun 2016 23:49:59 +0000 (23:49 +0000)]
Merge \"Update Settings to use DeviceDefault.Settings.\" into nyc-mr1-dev
am:
70ff5f8fa1
Change-Id: I3b556a3f7b0146deadf59b7c8fb244580b060fdf
Andrew Sapperstein [Tue, 21 Jun 2016 23:02:12 +0000 (23:02 +0000)]
Merge "Update Settings to use DeviceDefault.Settings." into nyc-mr1-dev
Doris Ling [Tue, 21 Jun 2016 20:23:26 +0000 (13:23 -0700)]
Remove summary text for Backup & reset.
Remove the SummaryProvider from PrivacySettings so that it will not show
the summary for the Backup & reset settings.
Bug:
29519430
Change-Id: Idf41c2f794391f81bf864ade0db9087c2e3e1c0e
Doris Ling [Tue, 21 Jun 2016 19:04:29 +0000 (19:04 +0000)]
Merge \"Add play icon to the gesture settings videos.\" into nyc-mr1-dev
am:
9ca0e6cc86
Change-Id: I542d48564a52b2ae7dd8497cdebde19086fe53bb
Doris Ling [Tue, 21 Jun 2016 18:55:54 +0000 (18:55 +0000)]
Merge "Add play icon to the gesture settings videos." into nyc-mr1-dev
Andrew Sapperstein [Mon, 20 Jun 2016 01:40:36 +0000 (18:40 -0700)]
Use colorSecondary for switch bar backgrounds.
Delete the private version in favor of using the platform's.
BUG:
28625050
Change-Id: I6bf0a13e5018f48f32a26a38307c30cf1aee0619
Daniel Sandler [Tue, 21 Jun 2016 18:29:19 +0000 (18:29 +0000)]
Merge \\"Show \\"0\\" instead of \\"0 B\\" in storage settings.\\" into nyc-dev am:
87fcf9e95f
am:
698fe0a9b0
Change-Id: I4d1d95d66b02d18c6f2ba80b0348895e542ae57f
Daniel Sandler [Tue, 21 Jun 2016 18:28:35 +0000 (18:28 +0000)]
Merge \\"Show \\"0\\" instead of \\"0 B\\" in storage settings.\\" into nyc-dev am:
87fcf9e95f
am:
7df9a28fdb
Change-Id: I14d23175a455c21df8d526bfa2ae034e80e199d5
Andrew Sapperstein [Sat, 11 Jun 2016 19:12:44 +0000 (12:12 -0700)]
Update Settings to use DeviceDefault.Settings.
BUG:
28625050
Change-Id: Id283703a309cf27bb284147421614196e903c660
Dan Sandler [Tue, 21 Jun 2016 18:18:21 +0000 (18:18 +0000)]
Merge \"Show \"0\" instead of \"0 B\" in storage settings.\" into nyc-dev
am:
87fcf9e95f
Change-Id: I94d18998914552d21099b12b22471ea93857cf52
Dan Sandler [Tue, 21 Jun 2016 18:17:08 +0000 (18:17 +0000)]
Merge \"Show \"0\" instead of \"0 B\" in storage settings.\" into nyc-dev
am:
87fcf9e95f
Change-Id: I40778ba470d12dd6f5b924ddcf650f27459faab6
Daniel Sandler [Tue, 21 Jun 2016 18:11:11 +0000 (18:11 +0000)]
Merge "Show "0" instead of "0 B" in storage settings." into nyc-dev
Pavel Zhamaitsiak [Tue, 21 Jun 2016 18:09:07 +0000 (18:09 +0000)]
Merge \"Hide WFC settings if WFC is not provisioned (and provisioning is required)\" into nyc-mr1-dev
am:
4f3a7589bc
Change-Id: Id9a51ea55922879c2776964d7a0d3c7a3ad8877b
Jason Monk [Tue, 21 Jun 2016 18:04:39 +0000 (14:04 -0400)]
Fix tethering re-enable after edit.
Sometimes the tether state change comes in late (or seemingly not
at all). Also listen for wifi ap state changes as a fallback for
this case.
Change-Id: I6677c4277453be881967a3cf2234de11cd0237b8
Fixes:
28851179
TreeHugger Robot [Tue, 21 Jun 2016 17:58:25 +0000 (17:58 +0000)]
Merge "Hide WFC settings if WFC is not provisioned (and provisioning is required)" into nyc-mr1-dev
Jason Monk [Tue, 21 Jun 2016 17:36:57 +0000 (13:36 -0400)]
Update battery content descriptions with labels
Change-Id: I0ad4ca753f8f5e1a01e2e21181526ddb921d487a
Fixes:
28301362
Fan Zhang [Tue, 21 Jun 2016 17:27:31 +0000 (17:27 +0000)]
Merge \"Enable/disable support buttons based on operation hours.\" into nyc-mr1-dev
am:
a00e3b78de
Change-Id: I62abaad50d57747197450dd09c7fb224a1a10ec1
Fan Zhang [Tue, 21 Jun 2016 17:21:07 +0000 (17:21 +0000)]
Merge "Enable/disable support buttons based on operation hours." into nyc-mr1-dev
Bill Yi [Tue, 21 Jun 2016 17:02:49 +0000 (17:02 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
f315e2e6f0 -s ours
am:
440199c6c4 -s ours
Change-Id: I09f6c8d03838d659c42ef85c2a201258679346ef
Daniel Nishi [Thu, 9 Jun 2016 17:52:35 +0000 (10:52 -0700)]
Remove the Deletion Helper and Automatic Storage Management jobs.
The automatic storage management settings have been left in place
and updated to use the intent to get into the deletion helper.
Bug:
28965462
Change-Id: I736c8e741b519eceb89075b74d42b38c3aa5d0f4
Bill Yi [Tue, 21 Jun 2016 16:58:10 +0000 (16:58 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
f315e2e6f0 -s ours
am:
672e1ddb14 -s ours
Change-Id: Ia75f957c8348a0562d7941220b8a796fe57d363d
Bill Yi [Tue, 21 Jun 2016 16:58:09 +0000 (16:58 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
5903be35f4 -s ours
Change-Id: I12bdb0e46f4401413a38b8b699e464929e88f504
Bill Yi [Tue, 21 Jun 2016 16:56:45 +0000 (16:56 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
f315e2e6f0 -s ours
Change-Id: I2b7c6b292d8197f588fca6dc8c05a329e58d6733
Bill Yi [Tue, 21 Jun 2016 16:56:44 +0000 (16:56 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
f315e2e6f0 -s ours
Change-Id: I8216d1ead0653fff4d1a335f11ff92879d587fcc
TreeHugger Robot [Tue, 21 Jun 2016 16:53:39 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 21 Jun 2016 16:53:25 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Sunny Goyal [Tue, 21 Jun 2016 16:48:12 +0000 (16:48 +0000)]
Merge \"Adding custom manifest shortcuts in Settings app\" into nyc-mr1-dev
am:
139fbb78b5
Change-Id: I0dbe76be67dfe27f7e0a28d6a2eeb7da97cec19a
Sunny Goyal [Tue, 21 Jun 2016 16:39:33 +0000 (16:39 +0000)]
Merge "Adding custom manifest shortcuts in Settings app" into nyc-mr1-dev
Zoltan Szatmary-Ban [Tue, 21 Jun 2016 16:00:35 +0000 (16:00 +0000)]
Fix non-app non-user preferences in Settings > Data usage am:
afea1cae25
am:
e341462a50
Change-Id: Idc9d5d2381b7c33cedc6b3d1e8bac1776b3ab1e9
Zoltan Szatmary-Ban [Tue, 21 Jun 2016 15:57:08 +0000 (15:57 +0000)]
Fix non-app non-user preferences in Settings > Data usage
am:
afea1cae25
Change-Id: I55e991f5cd9c39a740dd62945fe113ee59ea18a9
Zoltan Szatmary-Ban [Tue, 21 Jun 2016 15:55:07 +0000 (15:55 +0000)]
Fix non-app non-user preferences in Settings > Data usage am:
afea1cae25
am:
63170fbf7a
Change-Id: Iabfb95c0b071b8ebe2ab8a659d323a9cda2656d5
Zoltan Szatmary-Ban [Tue, 21 Jun 2016 15:52:33 +0000 (15:52 +0000)]
Fix non-app non-user preferences in Settings > Data usage
am:
afea1cae25
Change-Id: I09905ec152a16e12436927bd514fb6cbe5afb59a
Fan Zhang [Tue, 21 Jun 2016 15:35:07 +0000 (15:35 +0000)]
Merge \"Log button taps in support tab.\" into nyc-mr1-dev
am:
a2fe136837
Change-Id: I661ffe3744f44e69e886e8f5a825304f2c022d4b
Fan Zhang [Tue, 21 Jun 2016 15:28:29 +0000 (15:28 +0000)]
Merge "Log button taps in support tab." into nyc-mr1-dev
OSDN Git Service
