tree c11a4fe0f46f1df89ae08504e1d58730e34ae92e
parent 8b3560d3e68d6e596bc22b117b049e15cc7e1b3b
parent 27bd34d9d9fe99f11b80aa0bbdb402fb47ef4158
author Jeff Sharkey <jsharkey@android.com> 1348005166 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348005166 -0700

Merge "Multi-user MTP." into jb-mr1-dev