Merge "Add storage manager settings activity." into nyc-mr1-dev am: 798a28ace9
am: 4ee3ce5732
Change-Id: I575b3ab0ab21cc3af4ee2533e1372bfd4c6ca0ff
This commit is contained in:
798a28ace9
am: 4ee3ce5732
Change-Id: I575b3ab0ab21cc3af4ee2533e1372bfd4c6ca0ff