tree 8ce22d780b6d7645c89cf5ea8fe6a89c0a236bad
parent 9407592c44ac63d48a5bfcef3c52de2c5a8206f5
parent 361ccf5eef4353936d1de822135a6d67198bcdf7
author Steve McKay <smckay@google.com> 1466456049 +0000
committer android-build-merger <android-build-merger@google.com> 1466456049 +0000

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

Change-Id: Ibc7ebfa9d5f68014592b4fb8793358be5436efce