tree 4649dcae88337a18b80eeb4b84a786c1f0580a7e
parent 347cf3ea9e59edcc8612e7f211381e21b75b6eea
parent b3419d76a69cc589981c48cf18fc4343e8f293af
author Winson Chung <winsonc@google.com> 1496258676 +0000
committer android-build-merger <android-build-merger@google.com> 1496258676 +0000

Merge changes from topic 'hw_bitmap' into oc-dev am: 4e73123c52
am: b3419d76a6  -s ours

Change-Id: I42136064a8ef7339fdb3c2b0bd18fc6693219d09