tree 61c600067595841343b77fc3465b35bb63b11557
parent 2717eaba05a77e6cc7646c06fbd57804ab17d948
parent 2563c0f3b0aa07309d42c0d739880884b8131080
author Mathias Agopian <mathias@google.com> 1497036987 +0000
committer android-build-merger <android-build-merger@google.com> 1497036987 +0000

Merge "Add missing VNDK pixel formats to AHardwareBuffer" into oc-dev
am: 2563c0f3b0

Change-Id: I10e623eebb70da1f4127c0eec2aa85867da0623c