| commit | 771e1d15f213ff905f7a8c5546baf2f0b2a71a76 | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Thu Apr 13 18:38:46 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 13 18:38:46 2017 +0000 |
| tree | dbd78efa0c67c6ab6d61c793f7d3f77dec6d1d28 | |
| parent | 5d4d6bead83427857d1e05b987be1fdaa79ec4eb [diff] | |
| parent | 37d23d9e379015b61c442d8182e9cb9db9f96b64 [diff] |
Merge "Merge "Merge "DO NOT MERGE: Updating CTS Security Patch to 2017-04" into marshmallow-cts-dev am: 8553cc030f -s ours" into nougat-cts-dev am: 6754facde4 -s ours" into nougat-mr1-cts-dev am: 37d23d9e37 -s ours Change-Id: I90194d0e4ddd9a0a1fbf7c3db302bd89b77e9581