tree 5a43236361f3b072ef842e18e5660a32ee118a73
parent 36924e59db60784d443365d2135a014751e721fe
parent 74cdc413acd33fb457ca2e4ad6819d2318297f68
author Austin Hu <austin.hu@intel.com> 1499801215 +0000
committer android-build-merger <android-build-merger@google.com> 1499801215 +0000

Merge "Worked around the random CTS testOtherH264ImageReader & DecodeAccuracyTest failure. am: dfc4b4b2ca am: c931ff2293" into oc-dr1-dev-plus-aosp
am: 74cdc413ac

Change-Id: I894bf55c87685fcdd1d0f8efebe2aad81c4b3599