| commit | c3921fd000ef0174c1b3b3f7547519724f116deb | [log] [tgz] |
|---|---|---|
| author | Victoria Lease <violets@google.com> | Mon Oct 29 10:36:43 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 29 10:36:43 2012 -0700 |
| tree | 4241115db1f4df4478bb6649a9ff87807bb04bcc | |
| parent | 5193efba34071527234f155ffb8cfe8850b14e00 [diff] | |
| parent | 167282f19f58ba5271c37bb16c4ea5bcd0bf6303 [diff] |
am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev * commit '167282f19f58ba5271c37bb16c4ea5bcd0bf6303': Revert "make FLP play nicely with multiuser"