| commit | dde4d493856b4746933e1b5da1f000e79d612611 | [log] [tgz] |
|---|---|---|
| author | Steven Ng <stevenckng@google.com> | Tue May 16 21:30:54 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 16 21:30:54 2017 +0000 |
| tree | 5067ba30d5ce3f8ff5b8565044d3401021609836 | |
| parent | e11a4d4e86054a589fed819e59bb7b6a08f688f9 [diff] | |
| parent | a2af16bb34d5b6ce5054a12051feb187f397a253 [diff] |
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr2-dev am: a2af16bb34 -s ours Change-Id: Ia126d3684bea6fdf19c58bc98324b019265af859