tree 37198171431d8fd3afcb9d8bc3bace99f6d549c8
parent 51b6724ae2a4b51d6b993edbb4cc2e71ecbbfccc
parent b89bcc9ae9e5fe7187f6bc62f171c8cce0b4e489
author Android Build Merger (Role) <android-build-merger@google.com> 1499800996 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499800996 +0000

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