tree e5fa396ad228d03f7a542c224eef0b1a40415a58
parent 4f85ec44a1adaaea6e9e74103f78ed9d8de60714
parent 7d3377ce5064b777408120ffa37e7a2b3b3a658c
author Zhijun He <zhijunhe@google.com> 1405365653 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405365653 +0000

am 7d3377ce: Merge "Camera2: update still capture template requirement"

* commit '7d3377ce5064b777408120ffa37e7a2b3b3a658c':
  Camera2: update still capture template requirement