| commit | e5d7c643615f4621582a0193dcb7d8b6c7deb2dd | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Thu Mar 16 22:56:20 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 16 22:56:20 2017 +0000 |
| tree | 56719456824f8c530ec2c5f216bf602b95652ebb | |
| parent | dc7e5158b9976e32f358a5e554fea511b73de306 [diff] | |
| parent | b2c68e90e0eddbaea5708ca4b5edc0c8ac56e574 [diff] |
Merge "DO NOT MERGE: Updating CTS Security Patch to 2017-03" into marshmallow-cts-dev am: 4d87717744 -s ours am: b2c68e90e0 Change-Id: Idcf858649bbeba1b6f115222be35ea52e5513199