| commit | 4e41eede41100b9d0cc02832c25db28febee3bce | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Fri Oct 10 16:53:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 10 16:53:17 2014 +0000 |
| tree | 89d109bc50286f2820ec7b462f5d63dfa079bf8a | |
| parent | a37c834b57e4829e5562b00ba6bd66f7928e7ff0 [diff] | |
| parent | 6e9857da67d46d658e28f73500f08182a9b15b7e [diff] |
am 6e9857da: resolved conflicts for merge of bbb36319 to lmp-mr1-dev-plus-aosp * commit '6e9857da67d46d658e28f73500f08182a9b15b7e': Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""