| commit | 76407fe7a54234ac5d24889afd02c5044fe45341 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Aug 10 17:04:04 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 10 17:04:04 2016 +0000 |
| tree | 66bc61086bd2e6162d0304494949612b6017c79d | |
| parent | acf6a3d3703a7f4b564883a9bb10d7d776c55628 [diff] | |
| parent | f062ffbf4499b700e3ac53d96463d1cbd53dd733 [diff] |
Merge "Revert "DO NOT MERGE: CTS test case for CVE-2015-1530" am: 480a3a5017 -s ours" into lollipop-mr1-cts-dev am: d105326d78 -s ours am: f062ffbf44 -s ours Change-Id: Ia4aa96ab448926e542de6c8829d8ea378dff3efd