tree e0417802932d787daf906e84938864898624c6be
parent a5f50e98d1408addcaaac27e4d13981163d12a15
parent 0f3e2daa1d56c98196a719a6e641f3ed67b8e7bf
author Abhishek Arya <aarya@google.com> 1440475204 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1440475204 +0000

Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev