tree 7fd53b37f4e901418e2f9dff29a6d22764e3b019
parent 169a149d5505fcf67bd221f9592963c01f02d1af
parent ffff217134fd0de8625cf39da56fa59a32a8c643
author Yin-Chia Yeh <yinchiayeh@google.com> 1402011427 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402011427 +0000

am 6d892689: Merge "Camera2: Do not hide TonemapCurve construtor" into lmp-preview-dev

* commit '6d892689f569871e2e711669c0262a7d25b3e091':
  Camera2: Do not hide TonemapCurve construtor