tree e7e3ea6713e95181f19b62788f7e4d80a6d2d598
parent d42c13d8846465fe4b46b69d9e7b74931960b452
parent d78e457c27eb2a2c80ad2441b636c020f7bb2184
author Ben Cheng <bccheng@google.com> 1401223378 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401223378 +0000

am d78e457c: Merge "Delete the panorama benchmark from camera."

* commit 'd78e457c27eb2a2c80ad2441b636c020f7bb2184':
  Delete the panorama benchmark from camera.