tree aaa523134acc980b99212d1bb9982fad5ffb0c04
parent e256cee844e39bc4007cb9682798dd1108531eae
parent 698615d9fde9b917b65508acc416bd58a33ce864
author Zhijun He <zhijunhe@google.com> 1380154327 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380154327 -0700

am 698615d9: am b9b540f6: Merge "Camera2: Update tests to use different API." into klp-dev

* commit '698615d9fde9b917b65508acc416bd58a33ce864':
  Camera2: Update tests to use different API.