tree 164db441cae0afe9040f8780ce7e383eafab4188
parent 3c165229b0672c32979fc43ab00735d8e36a0d45
parent e9a611324f218435e0a6604700fb7495f9ac661a
author Daniel Xie <dxie@google.com> 1445980276 +0000
committer android-build-merger <android-build-merger@google.com> 1445980276 +0000

Merge "DO NOT MERGE: Camera: add testAllOutputYUVResolutions back to known failure" into lollipop-mr1-cts-dev am: 6752d39a3b  -s ours am: 7692a1005f am: ef025b0604 am: 2507720476  -s ours
am: e9a611324f

* commit 'e9a611324f218435e0a6604700fb7495f9ac661a':
  DO NOT MERGE: Camera: add testAllOutputYUVResolutions back to known failure