OSDN Git Service

Merge "Set device credential's Window flag to be SECURE." into oc-dev
authorFan Zhang <zhfan@google.com>
Tue, 31 Oct 2017 18:36:12 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 Oct 2017 18:36:12 +0000 (18:36 +0000)
commit9bb4e0b7949893f7729627d1f9722fb2a90971b3
tree2e197fa2e98d236cf2ccacb8c02874d6068385b1
parenta68a0f04635ce66c30503c66b9bcc04ed7de1639
parente3d0bbcc801bf351cb9cc963d2df7b563d084869
Merge "Set device credential's Window flag to be SECURE." into oc-dev
am: e3d0bbcc80  -s ours

Change-Id: I8be390dc1e5190029be41a55c014c9e2705c7aef