OSDN Git Service

Merge \"Use Settings.Secure for days to retain.\" into nyc-mr1-dev
authorDaniel Nishi <dhnishi@google.com>
Mon, 13 Jun 2016 22:28:38 +0000 (22:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 22:28:38 +0000 (22:28 +0000)
am: 584320adb8

Change-Id: Ifd3f1542b9feb2747a54f380ff7047868e563251


Trivial merge