| commit | 0186afd29ce1b3ce96d0c5eb0cde32df1fea08d7 | [log] [tgz] |
|---|---|---|
| author | Mikhail Naganov <mnaganov@google.com> | Mon Oct 16 20:01:10 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 16 20:01:10 2017 +0000 |
| tree | dc0425c8463261d9a4928f41ed4c4d6a0b864abb | |
| parent | 64fd4c174e29e98e19219ec969386a7ed36b6de3 [diff] | |
| parent | f5ba63e338e06a5cb068b8b44d1ac21ccf809a78 [diff] |
Merge "Merge "DO NOT MERGE Add EffectBundleTest" into marshmallow-cts-dev am: 48ff42d15a -s ours" into nougat-cts-dev am: f5ba63e338 -s ours Change-Id: Ia64d0a919b5b28ea886b65334da15227bbb87e5e