tree f97e72ffaa70d5c5c4578d01cea307fbda1e4f74
parent 0ffabda3e6e63de1ed8f4ae16f0bfa7add0fcc99
parent 89d3d2ae01f1b322a946dc49090a7795de86c1d4
author Jesse Hall <jessehall@google.com> 1492801528 +0000
committer android-build-merger <android-build-merger@google.com> 1492801528 +0000

Merge "Match AHardwareBuffer format name change" into oc-dev am: 489edb395b
am: 89d3d2ae01

Change-Id: I5f3da6a9e9b3bbe621e433947754d79a0e6a3691