tree 5ef335b3dfde4c7e5f87d4d259cf428b31b010d0
parent c7fd306a780c6d6df34ab16d112d5192a7265613
parent 361ccf5eef4353936d1de822135a6d67198bcdf7
author Steve McKay <smckay@google.com> 1466455991 +0000
committer android-build-merger <android-build-merger@google.com> 1466455991 +0000

Merge \"Make advanced storage option sticky...\" into nyc-dev
am: 361ccf5eef

Change-Id: I2369ba044813d2392a73ab369c012f1eb0ef51e8