tree 94e5c32dcf58a3a580bd7a5c34ce60a7faede746
parent c4e4a9a03986bd17ae95e3cfcbe049124aec853a
parent 75ea877bc99b8ab4c68f54529a1f5dfbcff071ad
author Steve McKay <smckay@google.com> 1466456454 +0000
committer android-build-merger <android-build-merger@google.com> 1466456454 +0000

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

Change-Id: I6204de46dd54b2c2a89c9a44edd571179ae1ddab