commit | 826bf9b63f69f4e19011f7f72b022b50b89fca49 | [log] [tgz] |
---|---|---|
author | Ronghua Wu <ronghuawu@google.com> | Thu Jun 25 22:14:57 2015 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 25 22:15:06 2015 +0000 |
tree | 2ef2009fdcb4bdd9d6645d84dba2a9e5d0747411 | |
parent | f97497db5a7cfb8514836af39efef56488edf3ac [diff] | |
parent | cf6a4ba5a4aed486b61b87597aa6572d41213ba2 [diff] |
Merge "media: parse max-concurrent-instances." into mnc-dev