tree c8d71690d40a025a7e5adbdec50fbae5e501b62e
parent 6ec0815612bd4d35432689006814b953b233f266
parent 493110e0b4173a577df17f39079e5943fdd740f9
author Risan <risan@google.com> 1541220187 -0700
committer android-build-merger <android-build-merger@google.com> 1541220187 -0700

Merge "ResetListener in StorageManagerService" am: 6b3a5194d9
am: 493110e0b4

Change-Id: I25a0a9a949d17c0a0d05106dc91254f5fbc901e3