commit | f8ae1b84098af3042e3aa3c28f9c0549400e220f | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Wed May 11 11:21:19 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 11 11:21:19 2016 +0000 |
tree | 85bc38c3572cc6ee387b6d39cd243b2005034223 | |
parent | 46bab1704d533d8b7e74e835c10a7669a65c7ac0 [diff] | |
parent | d03094c830a8becc6fa6f95f43a7be9c9e246f65 [diff] |
Merge "Add test for EnterpriseGuard to test against the newly added user setting am: a27f51a485 am: fb25155003" into nyc-mr1-dev-plus-aosp