tree ff834471858d179000e18c12dcd5cd1c38966058
parent 7c1b10872f3d57b3afdb0f070fcf602e4d72df37
parent 996fe656340ede058a6f0e6b18f9ec525ddb4e27
author Chris Craik <ccraik@google.com> 1379723616 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1379723616 +0000

Merge "Correct bitmap merging logic" into klp-dev