| commit | 60e0b71d2dfb82ef873a2d862a65b6155cd52f68 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Sun Apr 17 05:55:54 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Apr 17 05:55:54 2016 +0000 |
| tree | a06ed026acce432df0bd62efcfa791f3e4680054 | |
| parent | 9fca0a9637dd00556fe98443bac1b939a25004f6 [diff] | |
| parent | a15c5e5766aa0c107b111d66f92aceccd3cfc738 [diff] |
Merge "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" into marshmallow-cts-dev am: a15c5e5 -s ours * commit 'a15c5e5766aa0c107b111d66f92aceccd3cfc738': DO NOT MERGE: Disable CVE 2015_3826 test Change-Id: I4d3c05792bc5b3fb771125ce00420386f79d87e1