| commit | 3d3113cb2c406fae486925dc7495ed4e75239fec | [log] [tgz] |
|---|---|---|
| author | Hal Canary <halcanary@google.com> | Wed May 30 11:29:32 2018 -0400 |
| committer | Derek Sollenberger <djsollen@google.com> | Wed May 30 16:44:29 2018 +0000 |
| tree | 92fc9b043808808d38d1d7a9516a0019dc41b556 | |
| parent | e159e2b29f89239aa6af71294991fec0e0a4a3ca [diff] | |
| parent | 778745200389679158057bb1e53f3f16d13b3ef8 [diff] |
Merge remote-tracking branch remotes/aosp/upstream-skqp/release into aosp/master Exempt-From-Owner-Approval: The fast-forward merge does not require owner approval. Change-Id: I81b5f83ef702dba61ac22958e973c05976fdd3fe