| commit | 6841aefbbcab8dcb30035cab4a557e7d159e84f0 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Thu Oct 09 21:34:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 09 21:34:38 2014 +0000 |
| tree | b9623eaa309d3c376c424d1b7f1d7fdc4d0b75ed | |
| parent | 714edda9f373ae22b1cd02b7761b47ab0a37bb6c [diff] | |
| parent | cc496dbcd709230c35016e3d84ad06d1e44de9b8 [diff] |
am cc496dbc: resolved conflicts for merge of ae413a71 to lmp-mr1-dev-plus-aosp * commit 'cc496dbcd709230c35016e3d84ad06d1e44de9b8': Enable verity on userdebug, and add disable-verity to adb