| commit | 6868b2c806c52cbd4d5518fa076b64ab6d531036 | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Thu Apr 13 18:56:28 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 13 18:56:28 2017 +0000 |
| tree | a8fe4faf236587b60d57079f2f166bc314bc7072 | |
| parent | 54d3d82d20ec45f71c372f8cdcc8f7a1da7bb149 [diff] | |
| parent | 908ec15ec1655b0511977e1ba19959c53a27cb82 [diff] |
Merge "DO NOT MERGE: Updating CTS Security Patch to 2017-04" into marshmallow-cts-dev am: 8553cc030f -s ours am: dc966b8c77 am: ffcc117ff1 am: 5e927ef761 am: 908ec15ec1 -s ours Change-Id: Idcd2d3e91d07d79d6728694ce7f849cd98032191