tree e3fc441d605b80c3f81b34254d4b41319dcfe217
parent ece74522cb1f224c598966c513d3cca0949b36e9
parent ef025b0604d9e3209ef07347f2b66cfb0d405b60
author Daniel Xie <dxie@google.com> 1445979696 +0000
committer android-build-merger <android-build-merger@google.com> 1445979696 +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

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