[automerger skipped] Merge "Fix a strict mode violation in SystemUpdatePrefController" into pi-dev am: 9e629edb09

am: b76c1ba682  -s ours

Change-Id: I52c4160b9f2e5c713c0174b2e27e475b3ea44f31
This commit is contained in:
Fan Zhang
2018-05-10 23:04:02 -07:00
committed by android-build-merger

Diff Content Not Available