| commit | e38e45934fca4f7867a13074b45f6f7a5e597c28 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Sun Apr 17 05:49:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Apr 17 05:49:50 2016 +0000 |
| tree | 712d14724e1e298538ed96eb951614db8135fbe7 | |
| parent | 9de3bf0d4b747453705eee7cf09008538c2e665c [diff] | |
| parent | b2ea49c925176efdc98faa4f2ed5729e70aefbc1 [diff] |
Merge "Merge "DO NOT MERGE: Disable CVE 2015_3826 test" into lollipop-cts-dev am: f0f6423 -s ours" into lollipop-mr1-cts-dev am: b2ea49c -s ours * commit 'b2ea49c925176efdc98faa4f2ed5729e70aefbc1': DO NOT MERGE: Disable CVE 2015_3826 test Change-Id: I4821241876c3e338eb695cd7f1612c48a3ecc765