tree a76b026fa895651a4af812e6e668a13f5edeef3a
parent 1a2fdb496ec080cd6ff7ed547320dcfa7994abbd
parent d95d3bfb2b28a4f21f3fdcd740160c9a61eb0363
author Jeff Sharkey <jsharkey@android.com> 1429074186 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1429074188 +0000

Merge "Persist nickname and flags for volumes."