tree e565fbf48c3315b570575b3d835c0ba5af2de33b
parent b0f40861c99a2b2da00cd1cd2db590e74cb2b6e4
parent beb11a582ac714872af9735c46868d8bcd406ade
author Yin-Chia Yeh <yinchiayeh@google.com> 1528410499 -0700
committer android-build-merger <android-build-merger@google.com> 1528410499 -0700

Merge "Camera: update tonemap image in html doc" into pi-dev
am: beb11a582a

Change-Id: Id2471de89e2d44ae9deaa31144d96218d84ea34b