| commit | 00266d056c9a5e8c9c0d5fff1768a49e93905d8d | [log] [tgz] |
|---|---|---|
| author | Steven Ng <stevenckng@google.com> | Tue May 16 21:36:53 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 16 21:36:53 2017 +0000 |
| tree | 5067ba30d5ce3f8ff5b8565044d3401021609836 | |
| parent | dde4d493856b4746933e1b5da1f000e79d612611 [diff] | |
| parent | 6496c3757b09811b5e63ab70c48573c10d9e0b94 [diff] |
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours am: 6496c3757b -s ours Change-Id: I2c58871339e8d2591afe38d58b2ec26b66f917b5