tree c2d02e6258fe310359a0926fa1f3b7d0d578345d
parent d3a8a953995b5fbfeb75d1aec5240a8bce497b20
parent 0138548ce7c542614e23e8320144244acdca88db
author TreeHugger Robot <treehugger-gerrit@google.com> 1501795172 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501795172 +0000

Merge "camera: Change HDR+ shot hint to 2s" into oc-dr1-dev