| commit | 623362c5ab6fbb49c74ae34fb72beccc9de9a3dc | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Mon Jul 18 21:09:37 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 18 21:09:37 2016 +0000 |
| tree | c4829196166919d20d2a40157222a33ba2df04e0 | |
| parent | b4eba24135baf54e09dabf7f5de0a439b83ac926 [diff] | |
| parent | 6ad9c16ffd402f8424e48ef53c21a73f3fdece5c [diff] |
Merge \"Fix vulnerability in LockSettings service\" into nyc-mr1-dev am: 6ad9c16ffd Change-Id: Id4db555de3df2d73046aa6358e6b559f4529890d