OSDN Git Service

am 92aa0532: am 5e47eb95: am 35a7b54e: am f9a51893: (-s ours) am 9a2be5d4: Merge...
authorAbhishek Arya <aarya@google.com>
Tue, 25 Aug 2015 16:32:47 +0000 (16:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Aug 2015 16:32:47 +0000 (16:32 +0000)
commitff9a97f62344dc318b90c5b62ae3c7d3be5ab90e
treed4b4abed3ed3efb699d0b08dff935d3ee9e8a560
parent1fd9995cad1c774c907480d0e4f4d201e81c3e8f
parent92aa0532ab7cfd70011f70bc909249b894a840d0
am 92aa0532: am 5e47eb95: am 35a7b54e: am f9a51893: (-s ours) am 9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev

* commit '92aa0532ab7cfd70011f70bc909249b894a840d0':
  DO NOT MERGE - Fix software video decoder buffer size calculation