tree 98f0dda13a2502ad25691498483002ed570757df
parent 98d75a2cb60030c8e792c39306f3ba22a187c6b5
parent bcb402b2108a3dcf43d5753b9d68dc831a54b743
author TreeHugger Robot <treehugger-gerrit@google.com> 1461856377 +0000
committer android-build-merger <android-build-merger@google.com> 1461856377 +0000

Merge "Merge "Properly parcel HdrCapabilities." into nyc-dev am: 5bddeaa am: ee1bb34" into nyc-mr1-dev-plus-aosp
am: bcb402b

* commit 'bcb402b2108a3dcf43d5753b9d68dc831a54b743':

Change-Id: I19e1b945c74385eab7acb80a716956f98fa3bc9c