| commit | 5e927ef761cb08033eac8ae6edee17763a22da50 | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Thu Apr 13 18:44:21 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 13 18:44:21 2017 +0000 |
| tree | d389cb8de4c467f0a03c3578a577ccc83554d8fa | |
| parent | 5e77ff481bb259025716561c7c8a369d539ebc59 [diff] | |
| parent | ffcc117ff1de8380e52584cd5fbb57aea76066fd [diff] |
Merge "DO NOT MERGE: Updating CTS Security Patch to 2017-04" into marshmallow-cts-dev am: 8553cc030f -s ours am: dc966b8c77 am: ffcc117ff1 Change-Id: I57d3eaebdc2ce0339b54f7037d0b0e39c241a20d