tree 18def4ed5f38319dba6d8ca3a2b6249c0cbb164b
parent a583a4bb8bbdc2f64206edb34bde59e42ca1452c
parent 92e64a65ee00054d2248f13eff76ea388e3ac23c
author Steve McKay <smckay@google.com> 1466456290 +0000
committer android-build-merger <android-build-merger@google.com> 1466456290 +0000

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

Change-Id: Ieac67d5e0d8aa3ef3ab97173aec14ded4517cb01