tree ffdac73639aef543eb332234b8e390263a79f365
parent aa1567f9ba3611647968ab7786fd3a51abeffb32
parent 2d5e89778e955b4ff209a93e738761356349d48c
author Zhijun He <zhijunhe@google.com> 1391819777 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1391819777 +0000

Merge "Camera2: Add OFF_KEEP_STATE mode"