commit | 21b3440727916841e3fdcc91bef46343b5abad0a | [log] [tgz] |
---|---|---|
author | Ta-wei Yen <twyen@google.com> | Tue Mar 15 23:59:44 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 15 23:59:44 2016 +0000 |
tree | 30265a8330be17b73fc944ddee4b4e577ad93543 | |
parent | 725fb1bee48f41a574ae4c108d625e1cd1163a49 [diff] | |
parent | e80368d449950c0d13ba78f5b8fa6eb62eafa384 [diff] |
Merge "DO NOT MERGE Defer VVM activation/deactivation until device is unlocked." into nyc-dev