| commit | a37c834b57e4829e5562b00ba6bd66f7928e7ff0 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Thu Oct 09 22:27:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 09 22:27:09 2014 +0000 |
| tree | 70859686f14c105d16918f3ae29cb5a117d83787 | |
| parent | 7fa494ac6879accaf29f922d177ed8db44c6855a [diff] | |
| parent | c638c6647d0a8e30b2e176e36b1c08ef57766f06 [diff] |
am c638c664: resolved conflicts for merge of a49bfc0d to lmp-mr1-dev-plus-aosp * commit 'c638c6647d0a8e30b2e176e36b1c08ef57766f06': Revert "Enable verity on userdebug, and add disable-verity to adb"