OSDN Git Service

Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev
authorVictoria Lease <violets@google.com>
Mon, 29 Oct 2012 17:34:11 +0000 (10:34 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 29 Oct 2012 17:34:11 +0000 (10:34 -0700)

Trivial merge