tree abf6ddefd466bf472cc454e9c7615cb06c503dda
parent fd2d859445d614ab3f6c4687de839097566ac317
parent 5c6230ebf613bfd5d479b3b17f5a5b1c0450944e
author Chien-Yu Chen <cychen@google.com> 1433365310 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1433365320 +0000

Merge "Camera: Update for torch callbacks" into mnc-dev