| commit | 9907fb1097308223ba4a405e049d191433711cdd | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue May 10 22:19:54 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 10 22:19:54 2016 +0000 |
| tree | d9c842172d33cb5aa1841de2fa8e5e7defcd78fe | |
| parent | 02a35e38571af1d88cd48f363e6cac9e807bb79b [diff] | |
| parent | 722beb1b8153fda6519e9af01757030e8662aa5b [diff] |
Merge "Merge "Wipe device on policy error" into nyc-dev am: 8a59fa8524 am: 71bac3fa4b" into nyc-mr1-dev-plus-aosp