tree 8f89f5b0e1bca4c41c8e5658f048a2f5b6697dcd
parent 0888556e14c90a5dcf43ae31159418bc60a97128
parent 3b4383ae1c6491f088a6752c71d1d57115941b96
author Eino-Ville Talvala <etalvala@google.com> 1363911616 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1363911616 +0000

Merge "Camera: Add trigger metadata entries." into jb-mr2-dev