commit | 67bbf76d0d6b0b322a49713beb204bc202dd5aba | [log] [tgz] |
---|---|---|
author | Paul Crowley <paulcrowley@google.com> | Tue May 10 22:22:16 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue May 10 22:22:16 2016 +0000 |
tree | d14172c659294af88b3a97c81d6adbef1bdf43f6 | |
parent | 56db4ab0e477e35f7c43cb90b72f97098e8b72d1 [diff] | |
parent | 9907fb1097308223ba4a405e049d191433711cdd [diff] |
Merge "Merge "Wipe device on policy error" into nyc-dev am: 8a59fa8524 am: 71bac3fa4b" into nyc-mr1-dev-plus-aosp am: 5f53f6e1cd * commit '5f53f6e1cd010fb07c2d2336e2f6ba1deb6be29a': Change-Id: Ibe40d68ede4e6a2ef6454bc6bd751ed1658cc92d