| commit | f198fad8161318d7ca35a69824fee474864ef6d7 | [log] [tgz] |
|---|---|---|
| author | Fyodor Kupolov <fkupolov@google.com> | Wed May 20 21:48:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 20 21:48:39 2015 +0000 |
| tree | 61648008db91813c520ccb7f0a1e4f1ff0de9b0c | |
| parent | 59314315bd71fb5604ae429cb1f2cc1f46c3a45f [diff] | |
| parent | afb265d6a23b893e3398fa3b7dc5eed559c29cfc [diff] |
am afb265d6: am 289079d8: am 6b6c4618: am 62bc409c: am 11fb9d0d: Merge "Update cts to not require multi-user when managed_users are declared" into lollipop-cts-dev automerge: 3682098 * commit 'afb265d6a23b893e3398fa3b7dc5eed559c29cfc':