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:04:53 +0000 (23:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 Oct 2017 23:04:53 +0000 (23:04 +0000)
am: 3d94477fb8  -s ours

Change-Id: If5fd35415471ddb7a07899d7fff170fe63dd7dca


Trivial merge