tree bb90383a974a63c35c2340ea0cc80ecfe64fdee0
parent ce0b31b793cd74caecfd1adb4b8c7a99a2e6354f
parent 9e23973a85871f2c3563b5afd76bafbd65e06435
author Android Build Merger (Role) <android-build-merger@google.com> 1496917224 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1496917224 +0000

Merge "Merge "OMX codecs: send out EOS when input buffer has non-zero data and EOS." into oc-dev am: a626333666  -s ours am: 7c1ae0e73f  -s ours" into oc-dr1-dev-plus-aosp