tree d6f1bfe9430844ff8be97623ea853f051c8b542f
parent 5ec6335b74ede6dd8fb72c216133b40265571699
parent bc907cf9a8eb3dab10086a758f6202bf10215999
author Lucas Dupin <dupin@google.com> 1500409493 +0000
committer android-build-merger <android-build-merger@google.com> 1500409493 +0000

Merge "Don't recycle bitmaps we don't own" into oc-dr1-dev
am: bc907cf9a8

Change-Id: Ib5533fdbcfba36fc1ed82e0089cc681e73a02f05