tree d89dffe203ee8a7f27552eab38c2eefa4a7d2616
parent 390cdab47c55117ad1b8a9191af5aed2fef080da
parent 12b644d275b121dd952a4a564fa65b9c18c9b22c
author TreeHugger Robot <treehugger-gerrit@google.com> 1493127758 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1493127761 +0000

Merge "Introduce KEYSTORE_FLAG_CRITICAL_TO_DEVICE_ENCRYPTION" into oc-dev