OSDN Git Service

Merge \"Update Settings to use DeviceDefault.Settings.\" into nyc-mr1-dev
authorAndrew Sapperstein <asapperstein@google.com>
Tue, 21 Jun 2016 23:49:59 +0000 (23:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Jun 2016 23:49:59 +0000 (23:49 +0000)
am: 70ff5f8fa1

Change-Id: I3b556a3f7b0146deadf59b7c8fb244580b060fdf


Trivial merge