Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev am: a2af16bb34 -s ours am: dde4d49385 -s ours

Browse Source

am: 25e02bc80c  -s ours

Change-Id: I877a362643f92257fe2d741e4a2c9db3606f15d0

...

This commit is contained in:

Steven Ng

2017-05-16 21:43:13 +00:00

committed by android-build-merger

parent 6962c1841d 25e02bc80c

commit 470dc125c8

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available