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

* commit 'b0e357d548fb8d10896200add2b932199a96a2ea':
  Delete the panorama benchmark from camera.
tree: e7e3ea6713e95181f19b62788f7e4d80a6d2d598
  1. jni/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. CleanSpec.mk
  7. MODULE_LICENSE_APACHE2
  8. NOTICE