| commit | dc0f77b07497267f07e342cac74c9562631d8e6a | [log] [tgz] |
|---|---|---|
| author | Ta-wei Yen <twyen@google.com> | Wed Mar 16 00:35:00 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Mar 16 00:35:00 2016 +0000 |
| tree | 207c506aa3111dc3d926a493c6fde6bde67b19dd | |
| parent | 0fffe9905c180cb932cf5306a1f86ce7ead1b20d [diff] | |
| parent | 05dbfced7ff07b13674b500f90575cc51ccb8437 [diff] |
Merge "DO NOT MERGE Defer VVM activation/deactivation until device is unlocked." into nyc-dev am: 21b3440727 am: 05dbfced7f -s ours * commit '05dbfced7ff07b13674b500f90575cc51ccb8437': DO NOT MERGE Defer VVM activation/deactivation until device is unlocked.