OSDN Git Service

Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791
authorSteven Ng <stevenckng@google.com>
Tue, 16 May 2017 21:33:53 +0000 (21:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 May 2017 21:33:53 +0000 (21:33 +0000)
commit6496c3757b09811b5e63ab70c48573c10d9e0b94
tree55527317a6c1f853761a2c5410be1ab071faa505
parenta2af16bb34d5b6ce5054a12051feb187f397a253
parente05ef08a8e4127a33e94d3e939ce92b9018825c8
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791
am: e05ef08a8e  -s ours

Change-Id: I19d1bacf055fb660d4ce829222662abfafb9c4a8