OSDN Git Service
Bill Yi [Thu, 9 Feb 2017 02:50:10 +0000 (18:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9af5e9aadd1a56c25e96c7e476f266a4e5e27e2d
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 8 Feb 2017 23:12:54 +0000 (23:12 +0000)]
Merge "Hide "Use network recommendations" in Settings."
TreeHugger Robot [Wed, 8 Feb 2017 22:58:52 +0000 (22:58 +0000)]
Merge "Change PreferenceCategory margins."
TreeHugger Robot [Wed, 8 Feb 2017 21:55:08 +0000 (21:55 +0000)]
Merge "Fix wrong pref text on default apps"
Stephen Chen [Wed, 8 Feb 2017 20:41:12 +0000 (12:41 -0800)]
Hide "Use network recommendations" in Settings.
Bug:
35141347
Test: make -j40 RunSettingsRoboTests, manual inspection
Change-Id: I7661ef141aeb95d5ec707b8a066818892c3fa870
TreeHugger Robot [Wed, 8 Feb 2017 21:32:14 +0000 (21:32 +0000)]
Merge "Notification app screen updates"
Daniel Nishi [Wed, 8 Feb 2017 21:23:01 +0000 (21:23 +0000)]
Merge "Use the "fast track" storage calculation for all categories."
Lei Yu [Wed, 8 Feb 2017 20:33:35 +0000 (20:33 +0000)]
Merge "Create Advanced battery page"
TreeHugger Robot [Wed, 8 Feb 2017 20:11:08 +0000 (20:11 +0000)]
Merge "Fix for null pointer when launching Connected devices."
Fan Zhang [Wed, 8 Feb 2017 20:11:06 +0000 (12:11 -0800)]
Fix wrong pref text on default apps
Test: visual
Change-Id: I3f3e923ed0cebcffc5fc737353a781ecad21bf09
TreeHugger Robot [Wed, 8 Feb 2017 19:58:12 +0000 (19:58 +0000)]
Merge "Update App Info page layout."
Julia Reynolds [Wed, 8 Feb 2017 19:49:01 +0000 (14:49 -0500)]
Notification app screen updates
- Load channels asynchronously
- Add importance summary & block/unblock toggle for channel list
- Change channel list headers and sorting.
Test: manual
Change-Id: If024c741df4d85227055563d5bbc8210705c420b
Doris Ling [Wed, 8 Feb 2017 18:12:01 +0000 (18:12 +0000)]
Merge "Update text for User & accounts page."
Christine Franks [Wed, 8 Feb 2017 17:25:12 +0000 (17:25 +0000)]
Merge "Require password to FR in carrier demo mode"
Rubin Xu [Wed, 8 Feb 2017 16:04:22 +0000 (16:04 +0000)]
Merge "Deprecate old LockPatternUtils.clearLock()"
Christine Franks [Fri, 20 Jan 2017 19:24:14 +0000 (11:24 -0800)]
Require password to FR in carrier demo mode
Bug:
34341567
Test: manual - password is not required for regular user factory
resets and is required in carrier demo mode.
Change-Id: Ic594ebafdac02fc467dc6b2e46dfbd520db3ce9f
Julia Reynolds [Wed, 8 Feb 2017 13:34:19 +0000 (13:34 +0000)]
Merge "Api change."
TreeHugger Robot [Wed, 8 Feb 2017 10:18:26 +0000 (10:18 +0000)]
Merge "Fix music crash regression: Part Deux."
TreeHugger Robot [Wed, 8 Feb 2017 05:54:34 +0000 (05:54 +0000)]
Merge "Misc fix on top level items."
Sundeep Ghuman [Tue, 7 Feb 2017 02:31:42 +0000 (18:31 -0800)]
Change PreferenceCategory margins.
Top and bottom margins of the frame layout are changed to 8dp per bug
request. A 16dp top margin was added to the title in order to match
mocks provided in bug.
This also fixes the WifiPicker currently connectected access point to
make it centered.
Bug:
34978500,
34714183
Test: Visual. See screenshot in comments.
Change-Id: Idfa978b2defeb9b3f16651d670c5578f33b02656
Suprabh Shukla [Wed, 8 Feb 2017 01:53:25 +0000 (01:53 +0000)]
Merge "Removing unknown sources from security settings"
Doris Ling [Wed, 8 Feb 2017 01:16:47 +0000 (17:16 -0800)]
Fix for null pointer when launching Connected devices.
Check for null usb port before trying to loop through the list.
Change-Id: I37e44fac234fc6e774b8280509fb33e6165ce2dd
Fix:
35102512
Test: make RunSettingsRoboTests
TreeHugger Robot [Tue, 7 Feb 2017 23:58:15 +0000 (23:58 +0000)]
Merge "Add summary provider for Cast Setting (WifiDisplaySettings)"
Doris Ling [Tue, 7 Feb 2017 22:27:59 +0000 (14:27 -0800)]
Update App Info page layout.
- Update the header view layout to move the app icon to the left.
- Re-order the preference items on the page: Notifications,
Permissions, Storage, Data usage, Battery, Default
Change-Id: I936df7ed8305c0b5deae8b1d812e05833c2b7f11
Bug:
34977561
Test: Visual
Daniel Nishi [Tue, 7 Feb 2017 22:43:43 +0000 (14:43 -0800)]
Fix music crash regression: Part Deux.
Bug:
34888282
Test: Manual as a result of
34768986
Change-Id: Icebcb49befed5cc39eef7707ca6d97c45ec958aa
TreeHugger Robot [Tue, 7 Feb 2017 21:34:16 +0000 (21:34 +0000)]
Merge "Misc fix on network & internet screen for developer preview"
Junda Liu [Tue, 7 Feb 2017 20:43:19 +0000 (20:43 +0000)]
Merge "Ignore orientation change to preserve ApnEditor." into nyc-mr2-dev am:
18fce0a7cf
am:
dd9d72df53
Change-Id: I67aaada84389e24b153b514c936c0f72f7bcf641
Junda Liu [Tue, 7 Feb 2017 20:43:05 +0000 (20:43 +0000)]
Ignore orientation change to preserve ApnEditor. am:
76ad635ef7
am:
d7a13ef2b6
Change-Id: I98c554d475ba3bdd24dfd3bcb6d4597f514b440c
Junda Liu [Tue, 7 Feb 2017 20:40:12 +0000 (20:40 +0000)]
Merge "Ignore orientation change to preserve ApnEditor." into nyc-mr2-dev
am:
18fce0a7cf
Change-Id: I0492b3bd442c381f2b7b75707719cc3631bda796
Junda Liu [Tue, 7 Feb 2017 20:40:11 +0000 (20:40 +0000)]
Ignore orientation change to preserve ApnEditor.
am:
76ad635ef7
Change-Id: Ic32658c295821565d1c20245d0f8cb99942639e6
Junda Liu [Tue, 7 Feb 2017 20:35:46 +0000 (20:35 +0000)]
Merge "Ignore orientation change to preserve ApnEditor." into nyc-mr2-dev
TreeHugger Robot [Tue, 7 Feb 2017 20:34:52 +0000 (20:34 +0000)]
Merge "Re-add the break statement that was accidentally removed."
Stephen Chen [Tue, 7 Feb 2017 20:23:01 +0000 (20:23 +0000)]
Merge "Change number of showing tiles in ConfigureWifiSettings."
Stephen Chen [Tue, 7 Feb 2017 20:21:01 +0000 (12:21 -0800)]
Change number of showing tiles in ConfigureWifiSettings.
Test: manual inspection.
Change-Id: Ieecbff4416c69e902b9f0c5b4e4fc91907420b17
TreeHugger Robot [Tue, 7 Feb 2017 20:12:37 +0000 (20:12 +0000)]
Merge "Add Adaptive brightness as an inline result in Search"
Fan Zhang [Tue, 7 Feb 2017 18:39:01 +0000 (10:39 -0800)]
Add summary provider for Cast Setting (WifiDisplaySettings)
Change-Id: Ieaf413e3d698a9cbcb0560bfa65f380675677a74
Fix:
34976128
Test: make RunSettingsRoboTests
TreeHugger Robot [Tue, 7 Feb 2017 19:13:59 +0000 (19:13 +0000)]
Merge "Installed App loader only matches on prefixes"
Doris Ling [Fri, 3 Feb 2017 23:06:56 +0000 (15:06 -0800)]
Update text for User & accounts page.
- Add the user name to the Account preference group title.
- Add the summary text to Emergency information.
Bug:
34976320
Test: make RunSettingsRoboTests
Change-Id: I771e355ce3b313ffa50feb5c5e7907b1f3857592
Daniel Nishi [Tue, 7 Feb 2017 17:40:54 +0000 (09:40 -0800)]
Re-add the break statement that was accidentally removed.
This fixes the problem where the game fragment starts at the same
time as external sources.
Bug:
35056002
Test: b/
34768986
Change-Id: Ie35decc627dc6bec493a8c1f1976dc11d460f5fe
TreeHugger Robot [Tue, 7 Feb 2017 07:34:09 +0000 (07:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Tadashi G. Takaoka [Tue, 7 Feb 2017 06:21:31 +0000 (06:21 +0000)]
Merge "Fix BroadcastReceiver leakage"
Pavlin Radoslavov [Tue, 7 Feb 2017 06:20:51 +0000 (06:20 +0000)]
Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info" am:
ad62fd52c9 am:
14eb8cfe57 am:
8e81cf1310
am:
2a70967e41
Change-Id: Icc13b2847d8a7b6f0800bd067ac3fe3e01c478ec
Bill Yi [Tue, 7 Feb 2017 06:20:34 +0000 (06:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
b6c4241725 -s ours
am:
f78eb881f1 -s ours
Change-Id: I430f58095bf61e7fbd6fd8a99ad2de24ea16e350
Bill Yi [Tue, 7 Feb 2017 06:20:19 +0000 (06:20 +0000)]
Import translations. DO NOT MERGE am:
5d0af58793 -s ours
am:
edf73ab967 -s ours
Change-Id: I856c9036dad1726eb70b0569fc49352a66b02864
TreeHugger Robot [Tue, 7 Feb 2017 05:28:00 +0000 (05:28 +0000)]
Merge "Update the preference category title text color."
Pavlin Radoslavov [Tue, 7 Feb 2017 04:55:47 +0000 (04:55 +0000)]
Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info" am:
ad62fd52c9 am:
14eb8cfe57
am:
8e81cf1310
Change-Id: I513fdf69abc617944f5e0ce8195d16a451f61590
Pavlin Radoslavov [Tue, 7 Feb 2017 04:52:47 +0000 (04:52 +0000)]
Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info" am:
ad62fd52c9
am:
14eb8cfe57
Change-Id: Ie5f7b5157a6034ec7a206758b19cd51e3713fc12
Pavlin Radoslavov [Tue, 7 Feb 2017 04:50:15 +0000 (04:50 +0000)]
Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info"
am:
ad62fd52c9
Change-Id: I790c24917705ed7488ddfa467cb6c09241b34142
Treehugger Robot [Tue, 7 Feb 2017 04:45:35 +0000 (04:45 +0000)]
Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info"
Bill Yi [Tue, 7 Feb 2017 04:24:45 +0000 (04:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
b6c4241725 -s ours
Change-Id: Iddf470490c3be31666fe5e13776c3e0fb876dcd7
Bill Yi [Tue, 7 Feb 2017 04:24:44 +0000 (04:24 +0000)]
Import translations. DO NOT MERGE
am:
5d0af58793 -s ours
Change-Id: I779857080f5a48925a15904ff7090e3f95ed71ca
TreeHugger Robot [Tue, 7 Feb 2017 04:20:22 +0000 (04:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 7 Feb 2017 02:45:16 +0000 (02:45 +0000)]
Merge "Create a new PreferenceCategory for the current AP."
TreeHugger Robot [Tue, 7 Feb 2017 02:20:57 +0000 (02:20 +0000)]
Merge "Specify the fragment to launch when default home is clicked."
TreeHugger Robot [Tue, 7 Feb 2017 02:14:43 +0000 (02:14 +0000)]
Merge "Add a missing @Override annotation"
Fan Zhang [Mon, 6 Feb 2017 22:40:20 +0000 (14:40 -0800)]
Misc fix on network & internet screen for developer preview
- Move wifi calling into wifi preference screen
- Update tethering setting title
- Ripple for master swtich preference only apply on the left half.
- Move network reset to action bar overflow menu
Fix:
34974598
Fix:
34976385
Test: RunSettingsRoboTests
Change-Id: I0e11843efc52a0042784a4da46b7ac81fcf16138
Soroosh Mariooryad [Tue, 7 Feb 2017 02:12:55 +0000 (02:12 +0000)]
Merge "Adding the dismiss logic for setting smart suggestions."
Fan Zhang [Tue, 7 Feb 2017 01:56:39 +0000 (17:56 -0800)]
Misc fix on top level items.
- Update security tile title
Change-Id: I758a51f8c2d4279e506552c11596edd734275ff9
Bug:
34975053
Test: make RunSettingsRoboTests
TreeHugger Robot [Tue, 7 Feb 2017 01:55:20 +0000 (01:55 +0000)]
Merge "Update the color for the master switch divider."
Doris Ling [Tue, 7 Feb 2017 01:51:17 +0000 (01:51 +0000)]
Merge "Combine Language & region and Input & gestures in System settings."
Matthew Fritze [Thu, 26 Jan 2017 22:37:48 +0000 (14:37 -0800)]
Add Adaptive brightness as an inline result in Search
Bug:
34740449
Test: make RunSettingsRoboTests
Change-Id: I71acdcc04780a76263171a9d312d88a1eb61624a
Bill Yi [Tue, 7 Feb 2017 01:12:48 +0000 (17:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iad621de4653a4ebbf3e3161a58ec8edb40e26022
Auto-generated-cl: translation import
Bill Yi [Tue, 7 Feb 2017 01:07:30 +0000 (17:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id5c4337157e0839944afe449aa7f808f44709dd0
Auto-generated-cl: translation import
Doris Ling [Tue, 7 Feb 2017 00:17:05 +0000 (16:17 -0800)]
Update the preference category title text color.
Change the title color to colorAccent to be more visible.
Change-Id: Ia284fe7a17f3e769ebe97ad87f46b426942c39e8
Fix:
34978404
Test: Visual
Pavlin Radoslavov [Mon, 6 Feb 2017 23:37:01 +0000 (15:37 -0800)]
Catch IllegalStateException when updating Bluetooth A2DP codec info
Add an explicit check when calling getResources() inside
updateBluetoothA2dpConfigurationValues().
This fixes a potential race condition - the latter could be called
in background when processing intent update.
Bug:
35021206
Test: Manual UI testing
Change-Id: I38117c5b1e08f4b2ecfd7637bb3e34920aa0d296
Antony Sargent [Mon, 6 Feb 2017 23:27:16 +0000 (15:27 -0800)]
Add a missing @Override annotation
Test: none (no functional changes)
Change-Id: Ia91a15d9ca52d953c657278ea02ce0d1586ce0a0
Suprabh Shukla [Mon, 6 Feb 2017 23:25:29 +0000 (15:25 -0800)]
Removing unknown sources from security settings
The secure setting is deprecated starting from O. Removing it from the
settings UI so the user cannot change it. The unknown sources can be
managed at a more granular level by starting activity for intent
MANAGE_EXTERNAL_SOURCES
Test: Manually tested that the preference is removed and does not
disturb the other settings on the page.
Bug:
33947615
Change-Id: I8dc559d0e6aaaf5bad78fb6e04469d9ab647411d
Soroosh Mariooryad [Tue, 31 Jan 2017 21:28:38 +0000 (13:28 -0800)]
Adding the dismiss logic for setting smart suggestions.
Test: make RunSettingsLibRoboTests
Fixes:
35059823
Change-Id: I48a71ff525f6dded6f0b505280f5678a554f7183
Fan Zhang [Mon, 6 Feb 2017 23:13:00 +0000 (23:13 +0000)]
Update "more" icon so the 3 dots are perfectly round. am:
de172c7727
am:
5b27d0638e
Change-Id: I97985601d1e7f6bf643f2109329d42e457e4d0cc
TreeHugger Robot [Mon, 6 Feb 2017 23:07:51 +0000 (23:07 +0000)]
Merge "Move Special access from Default apps to Apps & notifications."
Fan Zhang [Mon, 6 Feb 2017 23:03:11 +0000 (23:03 +0000)]
Update "more" icon so the 3 dots are perfectly round.
am:
de172c7727
Change-Id: I66f612778874d84e23f0e757b4138df1672c4226
Doris Ling [Mon, 6 Feb 2017 22:40:13 +0000 (14:40 -0800)]
Update the color for the master switch divider.
Change the background attr for the divider to dividerVertical.
Change-Id: I6437c74c0951e43c6d438d282f7c686249cb9dd6
Fix:
34978085
Test: Visual
Sundeep Ghuman [Tue, 31 Jan 2017 20:23:53 +0000 (12:23 -0800)]
Create a new PreferenceCategory for the current AP.
This highlights the currently connected ap in it's own category.
Bug:
34714183
Test: Manual inspection with connected AP, APs available but not
connected, and Wifi off.
Change-Id: I100bcf5b0bdc7b4f725f2ff630aa885dbca90332
Christine Franks [Mon, 6 Feb 2017 22:27:11 +0000 (22:27 +0000)]
Merge "Allow factory reset in carrier demo mode"
jackqdyulei [Sat, 28 Jan 2017 00:11:13 +0000 (16:11 -0800)]
Create Advanced battery page
The advanced page shows two major parts, one is the battery usage
graph and the other is battery usage list. In usage list, each item
shows basic info of battery usage of one type(e.g. Apps, System)
Bug:
34385770
Test: RunSettingsRoboTests
Change-Id: I22475a489285787afa775af8d5ae3340eff1eed9
TreeHugger Robot [Mon, 6 Feb 2017 21:18:08 +0000 (21:18 +0000)]
Merge "Make picker icons scale larger."
Doris Ling [Mon, 6 Feb 2017 21:02:14 +0000 (13:02 -0800)]
Move Special access from Default apps to Apps & notifications.
Update the apps settings xmls to move Special access up one level.
Change-Id: I5ac6ec65ce0a296c0152ce8a793e145b44c01f4a
Fix:
34976728
Test: Visual
Fan Zhang [Mon, 6 Feb 2017 20:39:00 +0000 (12:39 -0800)]
Update "more" icon so the 3 dots are perfectly round.
Bug:
28194068
Test: visual
Change-Id: I23040c7fa638084fc653484e431039701c34bcb0
Julia Reynolds [Mon, 6 Feb 2017 20:29:17 +0000 (15:29 -0500)]
Api change.
Test: make -j32
Change-Id: If5f191b3832d46fd9f50eab51d1a80ea2a76fcad
Doris Ling [Sat, 4 Feb 2017 00:16:42 +0000 (16:16 -0800)]
Combine Language & region and Input & gestures in System settings.
Merge preferences into one page, and update test.
Bug:
34976047
Test: make RunSettingsRoboTests
Change-Id: I5f15192e42f6054c02d4c8ffa9f25db3075da409
Christine Franks [Tue, 24 Jan 2017 00:44:02 +0000 (16:44 -0800)]
Allow factory reset in carrier demo mode
Bug:
34341567
Test: manual - in carrier demo mode, go to Settings > Backup and
Reset > Factory data reset > Reset phone > Erase everything and
this entire path is viewable.
Change-Id: Ia5491765241adad97ecdb0a5bfd86a8371b8e4fe
Junda Liu [Sat, 4 Feb 2017 00:39:23 +0000 (16:39 -0800)]
Ignore orientation change to preserve ApnEditor.
Test: manually w/ Vzw and Tmo SIM on marlin. UI rotates while preserving
all values
Bug: b/
34956985
Change-Id: I1db34893fd91f99e38913565e7b67ccbfdcb0c93
Chenxi Song [Mon, 6 Feb 2017 17:37:10 +0000 (17:37 +0000)]
Merge "Provide more context for "App-level permissions""
TreeHugger Robot [Mon, 6 Feb 2017 05:47:40 +0000 (05:47 +0000)]
Merge "Refactoring of auto fill - lifecycle, auth, improvements - Settings"
Stephen Chen [Sat, 4 Feb 2017 00:27:43 +0000 (00:27 +0000)]
Merge "Change number of preferences showing in ConfigureWifiSettings."
Stephen Chen [Sat, 4 Feb 2017 00:24:48 +0000 (16:24 -0800)]
Change number of preferences showing in ConfigureWifiSettings.
Test: manual inspection.
Change-Id: If6a9f8ada05ef56f2db4d394903ccf839a184e98
Stephen Chen [Fri, 3 Feb 2017 23:40:56 +0000 (15:40 -0800)]
Make picker icons scale larger.
Bug:
34775322
Test: manual inspection.
Change-Id: Iaaa859874ec25a50677cb00bd963fc869c5b9649
Anton Philippov [Fri, 3 Feb 2017 21:01:23 +0000 (21:01 +0000)]
Merge "Enable the backup settings activity before launching"
Anton Philippov [Fri, 3 Feb 2017 16:01:52 +0000 (16:01 +0000)]
Enable the backup settings activity before launching
Bug:
34925593
Test: Manual
Change-Id: Ib27efa2138f56af37fe83376496a0d4c7a494e5b
Svet Ganov [Fri, 3 Feb 2017 10:41:52 +0000 (02:41 -0800)]
Refactoring of auto fill - lifecycle, auth, improvements - Settings
Test: manual
Change-Id: Ie425bfe1c71640cebe129cc0a2d5d09b731c57de
Bill Yi [Fri, 3 Feb 2017 09:36:36 +0000 (09:36 +0000)]
Import translations. DO NOT MERGE am:
10246513d7 -s ours
am:
311e4b4212 -s ours
Change-Id: Id30ae7b25ebb3b3851d576ad97f592eafa54dc1e
Bill Yi [Fri, 3 Feb 2017 09:34:34 +0000 (09:34 +0000)]
Import translations. DO NOT MERGE
am:
10246513d7 -s ours
Change-Id: I0fa5e10f5b31f605da8ce6555b6a6963c6b1dc3c
Bill Yi [Fri, 3 Feb 2017 07:43:15 +0000 (23:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia85a96f8c54e8cf487af5a395ab222b7fe25db15
Auto-generated-cl: translation import
songchenxi [Thu, 2 Feb 2017 19:27:37 +0000 (11:27 -0800)]
Provide more context for "App-level permissions"
Test: Manual
bug:
34795904
Change-Id: I79d9895b4c719bbd742d1714b909b2766b279dff
Alexey Polyudov [Thu, 2 Feb 2017 22:06:52 +0000 (22:06 +0000)]
fix the build breakage caused by merge resolution
am:
f689441eed
Change-Id: I1e62efcdb09b82c61f864470d8a5c8079832d74e
Alexey Polyudov [Thu, 2 Feb 2017 20:59:34 +0000 (12:59 -0800)]
fix the build breakage caused by merge resolution
commit
5d409ace19fa1d8d14d099c63f04ba45e4d578a8 broke the build
Change-Id: I62f55d8c1d023190af5171864998a2a4b2090a37
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
(cherry picked from commit
8c041f786200bed1050e8155aa620c02ab5db5cf)
Daniel Nishi [Tue, 31 Jan 2017 20:48:23 +0000 (12:48 -0800)]
Use the "fast track" storage calculation for all categories.
Bug:
34204877
Test: Settings Robo
Change-Id: I4a3e26e6e96e9b697c1019160c053b079076d3a2
Alexey Polyudov [Thu, 2 Feb 2017 21:01:49 +0000 (21:01 +0000)]
Merge "fix the build breakage cuased by merge resolution"
Matthew Fritze [Thu, 2 Feb 2017 21:00:31 +0000 (13:00 -0800)]
Installed App loader only matches on prefixes
Change-Id: Iefc6d681a1b616acf3c1354ff4d0f6c2c268895e
Fixes:
34688403
Test: make RunSettingsRoboTests
Alexey Polyudov [Thu, 2 Feb 2017 20:59:34 +0000 (12:59 -0800)]
fix the build breakage cuased by merge resolution
commit
5d409ace19fa1d8d14d099c63f04ba45e4d578a8 broke the build
Change-Id: I62f55d8c1d023190af5171864998a2a4b2090a37
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
OSDN Git Service
