tree 23a0bb9d677ebe45937a5f97f4726bdfbe8317e9
parent 7f08dcd927e40cdca9306d3517e8fb3115bd6ef2
parent 379aabd81e1eedcebcc24007c0274f8e6c00d211
author Dan Stoza <stoza@google.com> 1460999116 +0000
committer android-build-merger <android-build-merger@google.com> 1460999116 +0000

Merge "Hook up HDR capabilities from native SurfaceControl" into nyc-dev am: 554fa0f
am: 379aabd

* commit '379aabd81e1eedcebcc24007c0274f8e6c00d211':
  Hook up HDR capabilities from native SurfaceControl

Change-Id: I3fdd51c53b0aa6edb13a77238759a272dc067c16