commit 7799571e3bbbaed2eb23134f51369b63ca28a57f
author Mikhail Naganov <mnaganov@google.com> Mon Aug 14 19:52:39 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 14 19:52:39 2017 +0000
tree 7251feb6c05eb06653ed0655c989ff5757518c84
parent c7f335b25a8c2f48a22baf17ffc834473a772313
parent 0a6b27a505b03d7b6ab2c241dcff9cc637d7bae1

Merge changes from topic "fix-b-63662938-63526567-data-leak" into oc-dev

* changes:
  [automerger] Add EffectBundleTest am: e221f9a2a7 am: 8613c88a04 am: deafd9fb65 am: 03e3973989 am: 63e4a90a93 am: b6a8e52f03 am: 8163ae29b8 am: 4e2d4ad11a am: 0655c9ec99 am: fe153f2c9a am: 96c55dee00 am: 45cff88de0 am: 2c6b833594 am: b4a3c47774 am: 5e2a3cc836
  [automerger] Add EffectBundleTest am: e221f9a2a7 am: 8613c88a04 am: deafd9fb65 am: 03e3973989 am: 63e4a90a93 am: b6a8e52f03 am: 8163ae29b8 am: 4e2d4ad11a am: 0655c9ec99 am: fe153f2c9a am: 96c55dee00 am: 45cff88de0 am: 2c6b833594 am: b4a3c47774
  [automerger] Add EffectBundleTest am: e221f9a2a7 am: 8613c88a04 am: deafd9fb65 am: 03e3973989 am: 63e4a90a93 am: b6a8e52f03 am: 8163ae29b8 am: 4e2d4ad11a am: 0655c9ec99 am: fe153f2c9a am: 96c55dee00 am: 45cff88de0 am: 2c6b833594
  [automerger] Add EffectBundleTest am: e221f9a2a7 am: 8613c88a04 am: deafd9fb65 am: 03e3973989 am: 63e4a90a93 am: b6a8e52f03 am: 8163ae29b8 am: 4e2d4ad11a am: 0655c9ec99 am: fe153f2c9a am: 96c55dee00 am: 45cff88de0
  [automerger] Add EffectBundleTest am: e221f9a2a7 am: 8613c88a04 am: deafd9fb65 am: 03e3973989 am: 63e4a90a93 am: b6a8e52f03 am: 8163ae29b8 am: 4e2d4ad11a am: 0655c9ec99 am: fe153f2c9a am: 96c55dee00
  [automerger] Add EffectBundleTest am: e221f9a2a7 am: 8613c88a04 am: deafd9fb65 am: 03e3973989 am: 63e4a90a93 am: b6a8e52f03 am: 8163ae29b8 am: 4e2d4ad11a am: 0655c9ec99 am: fe153f2c9a
  [automerger] Add EffectBundleTest am: e221f9a2a7 am: 8613c88a04 am: deafd9fb65 am: 03e3973989 am: 63e4a90a93 am: b6a8e52f03 am: 8163ae29b8 am: 4e2d4ad11a am: 0655c9ec99
  [automerger] Add EffectBundleTest am: e221f9a2a7 am: 8613c88a04 am: deafd9fb65 am: 03e3973989 am: 63e4a90a93 am: b6a8e52f03 am: 8163ae29b8 am: 4e2d4ad11a
  [automerger] Add EffectBundleTest am: e221f9a2a7 am: 8613c88a04 am: deafd9fb65 am: 03e3973989 am: 63e4a90a93 am: b6a8e52f03 am: 8163ae29b8
  [automerger] Add EffectBundleTest am: e221f9a2a7 am: 8613c88a04 am: deafd9fb65 am: 03e3973989 am: 63e4a90a93 am: b6a8e52f03
  [automerger] Add EffectBundleTest am: e221f9a2a7 am: 8613c88a04 am: deafd9fb65 am: 03e3973989 am: 63e4a90a93
  [automerger] Add EffectBundleTest am: e221f9a2a7 am: 8613c88a04 am: deafd9fb65 am: 03e3973989
  [automerger] Add EffectBundleTest am: e221f9a2a7 am: 8613c88a04 am: deafd9fb65
  [automerger] Add EffectBundleTest am: e221f9a2a7 am: 8613c88a04
  [automerger] Add EffectBundleTest am: e221f9a2a7
  Add EffectBundleTest