OSDN Git Service

Merge "Settings tweaks" into nyc-dev
authorJason Monk <jmonk@google.com>
Sat, 9 Apr 2016 00:32:15 +0000 (00:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 9 Apr 2016 00:32:15 +0000 (00:32 +0000)
commit14b6f12aeaaa00d35feee4e5b19f9b6792874c5f
tree15fdbfbb80e5a9cd1f8277046c15e53a8522acae
parentd83867c551cbec4f69ee53042dce67707a2963bd
parentdb3fcfb7cb652c0afdd093e2ec9f387dc01b7819
Merge "Settings tweaks" into nyc-dev
am: db3fcfb

* commit 'db3fcfb7cb652c0afdd093e2ec9f387dc01b7819':
  Settings tweaks

Change-Id: Ibc9882219ad819cd516bf3c1ce7ce556b36ad9e6