| commit | dc966b8c77c7cdc9ac835062a10d6049d3bc8f56 | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Thu Apr 13 18:32:49 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 13 18:32:49 2017 +0000 |
| tree | 7784bf096fa2a44075a00c4d26eb8fdefda6bfb1 | |
| parent | 43e940a0826b821886b9763148c6afc0d6b35e20 [diff] | |
| parent | 8553cc030fd65ab0fd4e07b8c56021fc7da4f9e7 [diff] |
Merge "DO NOT MERGE: Updating CTS Security Patch to 2017-04" into marshmallow-cts-dev am: 8553cc030f -s ours Change-Id: I2429ad12c9daedbb93dd3ce468aaadce79436a28