tree e7eb53d04862639730f39ec64883959d8fb14f5c
parent c5cd99dd091d36b26223f29774308cb05ba9b4de
parent 83479600cb524f677ce7e547e711000daed547ee
author Daniel Nishi <dhnishi@google.com> 1474676430 +0000
committer android-build-merger <android-build-merger@google.com> 1474676430 +0000

Merge "Add a hidden action to trigger the storage manager settings." into nyc-mr1-dev
am: 83479600cb

Change-Id: I31c98396c146bfbca1f7a6758abe63ece8cd929d