tree 5afde96efee10d8083aae675c16c846601ee1646
parent b53acd946d1a5dd819d2fc208176250ae636a699
parent 250772047623b4a5099dd95a6a530e1ed2dbbcfb
author Daniel Xie <dxie@google.com> 1445979937 +0000
committer android-build-merger <android-build-merger@google.com> 1445979937 +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

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