tree 3c4666ed247ae10e17af10b195f8ae0ce6368602
parent 0cde14c35d9e151a4675cfcb5fbe9f1ac812a2ad
parent 231c59e688191956f93b13032422cab27dd39ca3
author Benjamin Franz <bfranz@google.com> 1472730209 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1472730209 +0000

Merge "Adding encryption aware matcher flags to install shortcut disabling" into nyc-mr1-dev