| commit | 2da3132554262e06f324dc03208e42644722257c | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Apr 13 19:40:28 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 13 19:40:30 2017 +0000 |
| tree | 8d4e4bcef234a91ea3aded9720c1273f3cbf7de2 | |
| parent | e5d2a4cbb486bd084d40e2b10e50ccd9274e844a [diff] | |
| parent | 2055c7abacbaef010728a1a443d409d3039ec233 [diff] |
Merge "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 am: 6868b2c806 am: a1cb8fd201 am: 6b7e392af5 am: 755ff29967 am: cdd61b459a -s ours am: c5ffc40938" into oc-dev-plus-aosp