OSDN Git Service

[automerger skipped] Merge "Fix a strict mode violation in SystemUpdatePrefController...
authorFan Zhang <zhfan@google.com>
Fri, 11 May 2018 06:04:02 +0000 (23:04 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 May 2018 06:04:02 +0000 (23:04 -0700)
am: b76c1ba682  -s ours

Change-Id: I52c4160b9f2e5c713c0174b2e27e475b3ea44f31


Trivial merge