OSDN Git Service

Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 21 Jul 2017 05:03:15 +0000 (05:03 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 21 Jul 2017 05:03:15 +0000 (05:03 +0000)

Trivial merge