tree 2de36888503c3be676ace90f3763543eb2740759
parent 0c04dc907b2db278dfcaeb7ddda42844c68ee5f8
parent 6752d39a3be57349da078ec5b1d2e7038326b007
author Daniel Xie <dxie@google.com> 1445979149 +0000
committer android-build-merger <android-build-merger@google.com> 1445979149 +0000

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

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