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:36:53 +0000 (21:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 May 2017 21:36:53 +0000 (21:36 +0000)
commit00266d056c9a5e8c9c0d5fff1768a49e93905d8d
tree5067ba30d5ce3f8ff5b8565044d3401021609836
parentdde4d493856b4746933e1b5da1f000e79d612611
parent6496c3757b09811b5e63ab70c48573c10d9e0b94
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e  -s ours
am: 6496c3757b  -s ours

Change-Id: I2c58871339e8d2591afe38d58b2ec26b66f917b5