OSDN Git Service

Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613...
authorFan Zhang <zhfan@google.com>
Tue, 31 Oct 2017 23:22:50 +0000 (23:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 Oct 2017 23:22:50 +0000 (23:22 +0000)
am: ceeb88e6a4  -s ours

Change-Id: I124dc166f29f4016c958720c627ee9c1afc21328


Trivial merge