tree 22e30d709114c6aaeb2c60f98ff1610d5b11a5cb
parent ea7a061c9cec052765a2ecc0366f55249f36bc38
parent 7002083f083d1139a30ac530ce8b914e6c5e91ef
author Eino-Ville Talvala <etalvala@google.com> 1346801079 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346801079 -0700

am 7002083f: Merge "Revert "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support""" into jb-mr1-dev

* commit '7002083f083d1139a30ac530ce8b914e6c5e91ef':
  Revert "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support""