| commit | 70dab70c30ae501da20603749ed8ce9c58e70199 | [log] [tgz] |
|---|---|---|
| author | Steven Ng <stevenckng@google.com> | Wed May 17 21:07:45 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 17 21:07:45 2017 +0000 |
| tree | bc51fd5bd7e6e5361f16fb2a7ea6ede44ea71e11 | |
| parent | c8df41ec8f0dbd78f1929b58975119e33ca08751 [diff] | |
| parent | be7621e1d76e8352afb50591c632fd8930962f03 [diff] |
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours am: 6496c3757b -s ours am: 9eeb954d39 -s ours am: be7621e1d7 -s ours Change-Id: I8232b0ee829d7c46dacd066a746fb8055a5e3818