OSDN Git Service

Merge "Setting should handle android.settings.SYNC_SETTINGS from managed profile...
authorRubin Xu <rubinxu@google.com>
Thu, 17 May 2018 19:14:17 +0000 (12:14 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 May 2018 19:14:17 +0000 (12:14 -0700)
am: ef088843ae

Change-Id: I0b0e7912fcbdcb819a6b7f2e50f91eef18b8092a


Trivial merge