tree ea3da957e34c9fe488675cea4c87f0c337fd641c
parent ab7272982c1f232edbc578a79a976391eb756930
parent 59c65a8a84bd8eb457fa5b8fe9201a4afddf6b36
author Rubin Xu <rubinxu@google.com> 1493128457 +0000
committer android-build-merger <android-build-merger@google.com> 1493128457 +0000

Merge "Introduce KEYSTORE_FLAG_CRITICAL_TO_DEVICE_ENCRYPTION" into oc-dev am: 4f86a894e1
am: 59c65a8a84

Change-Id: Ibb6f52de3195a636025a58989bb6566b274a8ad6