tree 9be51182f923e1492e8d5f398c0ff4bbd906cc89
parent 11be8c2346c24d6fd64168c2ac7057fb9d0e1460
parent f15f1ec0f4204d172b38ae57548df1a2a31d423c
author Eino-Ville Talvala <etalvala@google.com> 1359601179 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359601179 -0800

am f15f1ec0: (-s ours) Update camera metadata tests to new enums: DO NOT MERGE

# Via Igor Murashkin
* commit 'f15f1ec0f4204d172b38ae57548df1a2a31d423c':
  Update camera metadata tests to new enums: DO NOT MERGE