OSDN Git Service

am 2f73c3c2: am af13d3b0: am 826bf9b6: Merge "media: parse max-concurrent-instances...
authorRonghua Wu <ronghuawu@google.com>
Thu, 25 Jun 2015 22:54:44 +0000 (22:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Jun 2015 22:54:44 +0000 (22:54 +0000)
commit9db87a2479235cdc4145c898d7bbb25614423548
tree9426abf9a9a51a843723e34e7937ffae6dc89aed
parentc5f8f938e0485da387a812702cdf39956660f1f0
parent2f73c3c2d9da5f229a987e46399846d4e7d488be
am 2f73c3c2: am af13d3b0: am 826bf9b6: Merge "media: parse max-concurrent-instances." into mnc-dev

* commit '2f73c3c2d9da5f229a987e46399846d4e7d488be':
  media: parse max-concurrent-instances.