commit | 05dbfced7ff07b13674b500f90575cc51ccb8437 | [log] [tgz] |
---|---|---|
author | Ta-wei Yen <twyen@google.com> | Wed Mar 16 00:06:18 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Mar 16 00:06:18 2016 +0000 |
tree | 670e555b3bfa2be1effe1cd10604f7f5a85e36b7 | |
parent | 5a1156119a63f0d3f776a6cb86fbe84ae5a4ac6a [diff] | |
parent | 21b3440727916841e3fdcc91bef46343b5abad0a [diff] |
Merge "DO NOT MERGE Defer VVM activation/deactivation until device is unlocked." into nyc-dev am: 21b3440727 * commit '21b3440727916841e3fdcc91bef46343b5abad0a': DO NOT MERGE Defer VVM activation/deactivation until device is unlocked.