| commit | fcce1340c719c3fc09104d095dd25f6dbd82e7dc | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Fri Sep 12 23:21:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 12 23:21:33 2014 +0000 |
| tree | 8e8a32047b0285f56859e78c9c9102015ebbd042 | |
| parent | c01898c073de88ad4cefb96b35fed65016b62b62 [diff] | |
| parent | 8f9e3a06f1d628cca9b26d6f566a70e7818afd80 [diff] |
am 263a799f: am 849e1a9c: Merge "Prevent device owner registration after setup is complete" into lmp-dev * commit '263a799fb983559a431ff8f9ce30e3f773ee04d2': Prevent device owner registration after setup is complete