OSDN Git Service

Merge "Settings tweaks" into nyc-dev am: db3fcfb
authorJason Monk <jmonk@google.com>
Sat, 9 Apr 2016 22:44:01 +0000 (22:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 9 Apr 2016 22:44:01 +0000 (22:44 +0000)
am: 14b6f12  -s ours

* commit '14b6f12aeaaa00d35feee4e5b19f9b6792874c5f':
  Settings tweaks

Change-Id: I8b1c1cdcc17a6722c9aba2cb55956f0444f8b5fe


Trivial merge