OSDN Git Service

am 826bf9b6: Merge "media: parse max-concurrent-instances." into mnc-dev
authorRonghua Wu <ronghuawu@google.com>
Thu, 25 Jun 2015 22:27:32 +0000 (22:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Jun 2015 22:27:32 +0000 (22:27 +0000)
* commit '826bf9b63f69f4e19011f7f72b022b50b89fca49':
  media: parse max-concurrent-instances.


Trivial merge