tree fb669ceb1c41b5e1ef97ed61f6a601997ab6f0c6
parent 42bed6baca2dfab903ed138e6a4bb7d22473eea8
parent e6c93b88a0e8cb82d2bc3cbd1dabfe311c447dad
author android-build-team Robot <android-build-team-robot@google.com> 1525217537 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525217537 +0000

Merge changes from topic "am-986d85fc-0e97-4cac-9bb5-144e93067776" into ub-launcher3-master

* changes:
  [automerger] Reusing the same bitmap and pixel array for shape detection am: 2e4596a448
  Reusing the same bitmap and pixel array for shape detection