| commit | 6097da897adc3e97ccfebb20b7ece743b970e37e | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Mon Jul 18 21:15:43 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 18 21:15:43 2016 +0000 |
| tree | c1ea1b33f443071df00a4c36262a791b04c9e3ca | |
| parent | 0a669af445cc48cbea63d077d19d3a4577a6c63c [diff] | |
| parent | 623362c5ab6fbb49c74ae34fb72beccc9de9a3dc [diff] |
Merge \\"Fix vulnerability in LockSettings service\\" into nyc-mr1-dev am: 6ad9c16ffd am: 623362c5ab Change-Id: I7d604ab0a4c76672a765a064011574cd427aac64