tree 586412295ad12b1fe9936c40f974b9e6b0aa5d72
parent 91b1cb4b2304a0cb2b6448d8a8ae167f103a0886
parent 769e1e31f58831be5db35e6d33f36486650cac78
author Fan Zhang <zhfan@google.com> 1509490632 +0000
committer android-build-merger <android-build-merger@google.com> 1509490632 +0000

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08
am: 769e1e31f5

Change-Id: Ie3cf781e84803ef5e602e8885fe018a2bba993e4