| commit | 2728f179212e2c7066bc3cf9bfb54d6ebf22fe2a | [log] [tgz] |
|---|---|---|
| author | Mikhail Naganov <mnaganov@google.com> | Mon Oct 16 19:26:18 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 16 19:26:18 2017 +0000 |
| tree | e01f2559885eb19c50ec8019e33b623b5e9e3095 | |
| parent | 63dab7cebd68e55cc2778f3eb4e8ba1a8ed053d4 [diff] | |
| parent | ed04a2e9ea8ce961384827a2776c87d867ab2825 [diff] |
Merge "Merge "DO NOT MERGE Add EffectBundleTest" into lollipop-mr1-cts-dev am: a531363001 -s ours" into marshmallow-cts-dev am: ed04a2e9ea -s ours Change-Id: I021f2f41760d38a17fb914d58f2c161957fc9dce