tree 0c71f4eed636ed8548c9837c47f083b3095bad30
parent 78bb14bd6ed3ffa76b057b4931485c38eb1543d4
parent b3405649fa35cb3b23569c895a14d0684e25733d
author Daniel Nishi <dhnishi@google.com> 1474994219 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1474994220 +0000

Merge "Fix a deprecated config string name for the storage manager settings." into nyc-mr1-dev