| commit | 6d8632edc35f2ded5203af979cc8ca89ff6d33c4 | [log] [tgz] |
|---|---|---|
| author | Dave Weinstein <olorin@google.com> | Mon May 02 23:45:46 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 02 23:45:46 2016 +0000 |
| tree | 9353b6ad3ba61f5e0763135ff94cc02cbd77e6fb | |
| parent | 99af6afe80ccca650373182908a5deb8086640cd [diff] | |
| parent | 96a5b59d882714c06567a3e83f85fdcf184db679 [diff] |
resolve merge conflicts of 2b52be1 to mnc-dev am: ecd7e33dab am: 96a5b59d88 * commit '96a5b59d882714c06567a3e83f85fdcf184db679': CTS test case for CVE-2016-2419 Change-Id: Iec52f6540ce9fbf829e46b6bbe5fc1dad5343683