OSDN Git Service

Merge "Misc fixes for settings" into oc-mr1-dev
authorFan Zhang <zhfan@google.com>
Wed, 9 Aug 2017 18:03:29 +0000 (18:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 18:03:29 +0000 (18:03 +0000)
am: 54d816fd90

Change-Id: I7a015ea3ddd7b7cdd9db6896e6459ce3f491dabc


Trivial merge