commit | 5cb309d3ca60abbe9e601e0c1fc97de05ad2f64d | [log] [tgz] |
---|---|---|
author | Mikhail Naganov <mnaganov@google.com> | Mon Oct 16 19:23:14 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Oct 16 19:23:14 2017 +0000 |
tree | 55719054e686db58db93f9271b33335bca7c82c5 | |
parent | 18cd6d72c5f4c5abf270ccfe4cfa1e5f249d5d0c [diff] | |
parent | a53136300183309f1b91297dce614050d0bcdbcd [diff] |
Merge "DO NOT MERGE Add EffectBundleTest" into lollipop-mr1-cts-dev am: a531363001 -s ours Change-Id: Ib73c8a85af26fabe322eb5d2fc2693051540c47c