OSDN Git Service

am a0426ee2: (-s ours) am 0ca1e98f: Merge "media: Clarify MediaCodec and CodecCapabil...
authorLajos Molnar <lajos@google.com>
Thu, 27 Aug 2015 09:47:51 +0000 (09:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:47:51 +0000 (09:47 +0000)
commit9d05ec892e7bf579021e07805317bc4006a4f407
tree715d547d2502de8d04de0ec12233b3183ce62c99
parent47447567928bccbf594911cdf44184db73524fcd
parenta0426ee22ffbfdac7ee25815516c9d22631767e2
am a0426ee2: (-s ours) am 0ca1e98f: Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev

* commit 'a0426ee22ffbfdac7ee25815516c9d22631767e2':