tree 6a75a18d51c7ef4273f201b096015da06201f825
parent a2ca184e3018c01b51a44d74a098504681ef743c
parent 124acec8adffd30060dc4b50881ade068ed0fc2a
author Steven Moreland <smoreland@google.com> 1501358785 +0000
committer android-build-merger <android-build-merger@google.com> 1501358785 +0000

Merge "SurfaceTexture.cpp: use proper nativehelper headers" into oc-dev-plus-aosp
am: 124acec8ad

Change-Id: I1b9f55ed3661a440b89a7820bf4d1b9c66f240af