tree 74f050742c06563dc67cb62301f652c01979ab66
parent fdc79a8e9af9f4140f99117c997821e6eeb2c7d2
parent f60194b115edb4797464dd3714ed9d03f3ff21ff
author Zhijun He <zhijunhe@google.com> 1397767461 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397767461 +0000

am f60194b1: Merge "Camera2: Update sync.frameNumber tag"

* commit 'f60194b115edb4797464dd3714ed9d03f3ff21ff':
  Camera2: Update sync.frameNumber tag