| commit | ae8b8c177838ea6ae18adcc1bd34baed7b77f158 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Aug 10 17:34:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 10 17:34:01 2016 +0000 |
| tree | 3c9052062bd00e64eb5b93161e41e7a120897adc | |
| parent | e8db1bc0cc327d32dc8a6e36c5a2e7e56c40c5fd [diff] | |
| parent | 7a56f6b400c8133e13b48da7e60324764d1a8581 [diff] |
Merge "Merge "Revert "DO NOT MERGE: CTS test case for CVE-2015-1530"" into lollipop-cts-dev am: c4b650a386 -s ours" into lollipop-mr1-cts-dev am: 8f82f57c89 -s ours am: 1ab5f4ca14 -s ours am: eb35ad075f am: a1c45949f2 am: 7b81770d95 am: 74ed4b8011 -s ours am: 7a56f6b400 Change-Id: I9c04fca3ef703f9515e5b6dae0dc4006bbc07358