tree 62fd7c676a8fbc94c36c8bba03eead0190de784c
parent dca82b0d9c44fbb7af306df89a63e7cbf2e131c1
parent 4412faa9b441729804cadd81df418ef97d454fbd
author Zhijun He <zhijunhe@google.com> 1391819767 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1391819768 +0000

Merge "camera_metadata: Add OFF_KEEP_STATE flag mode"