OSDN Git Service

am af13d3b0: am 826bf9b6: Merge "media: parse max-concurrent-instances." into mnc-dev
authorRonghua Wu <ronghuawu@google.com>
Thu, 25 Jun 2015 22:42:00 +0000 (22:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Jun 2015 22:42:00 +0000 (22:42 +0000)
commit2f73c3c2d9da5f229a987e46399846d4e7d488be
tree2e3f8e10bb4497e2b0f4ada24f4f1b562f993f77
parent8be96748ea65207090d8dc1ffb4897a0669e7b94
parentaf13d3b009c5c39f6d4fa8d54fab724fdea73910
am af13d3b0: am 826bf9b6: Merge "media: parse max-concurrent-instances." into mnc-dev

* commit 'af13d3b009c5c39f6d4fa8d54fab724fdea73910':
  media: parse max-concurrent-instances.