| commit | 54d3d82d20ec45f71c372f8cdcc8f7a1da7bb149 | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Thu Apr 13 18:38:21 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 13 18:38:21 2017 +0000 |
| tree | a8fe4faf236587b60d57079f2f166bc314bc7072 | |
| parent | e8b915f3fed87175cf7bd9e194e2ac85258362d0 [diff] | |
| parent | 6754facde47c4dabfdc056e112146ae72e2a09a9 [diff] |
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 Change-Id: I43ee7de5e1f93c79103824d0ee8d3f4f2f19324d