OSDN Git Service

Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c...
authorFan Zhang <zhfan@google.com>
Fri, 3 Nov 2017 00:47:06 +0000 (00:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Nov 2017 00:47:06 +0000 (00:47 +0000)
am: fbc2fd065c  -s ours

Change-Id: I37ea4fa3cc14ee73b5bb2bc34612b6f1501c8c20


Trivial merge