OSDN Git Service

Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev
authorSteven Ng <stevenckng@google.com>
Tue, 16 May 2017 21:30:54 +0000 (21:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 May 2017 21:30:54 +0000 (21:30 +0000)
commitdde4d493856b4746933e1b5da1f000e79d612611
tree5067ba30d5ce3f8ff5b8565044d3401021609836
parente11a4d4e86054a589fed819e59bb7b6a08f688f9
parenta2af16bb34d5b6ce5054a12051feb187f397a253
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev
am: a2af16bb34  -s ours

Change-Id: Ia126d3684bea6fdf19c58bc98324b019265af859