tree fdc28a651a64b53e4cc14e3543347a2e64a80f38
parent bc77d3a1e0c19c1221c547d7e39311d74591c2d7
parent 4c9eb718352697cd75269752344c0bcc6b05e708
author Eino-Ville Talvala <etalvala@google.com> 1349461332 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349461332 -0700

am 4865c526: Camera2: Synchronize mode changes and triggers

* commit '4865c526e681366481b0ab242ffa1ead57bb02cc':
  Camera2: Synchronize mode changes and triggers