commit | fe6d4f094d2441314bb31fec10b520f80aeb481e | [log] [tgz] |
---|---|---|
author | Christoph Studer <chstuder@google.com> | Tue Nov 25 15:09:18 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:09:18 2014 +0000 |
tree | 58cdba4b929ac19d4a7f8378897e751058a44709 | |
parent | ff47355d2beb7257568ae9add24e99b3f3c185f7 [diff] | |
parent | 30646d87f240cd17917ad6d1ae83306d284b58b5 [diff] |
am 30646d87: am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev * commit '30646d87f240cd17917ad6d1ae83306d284b58b5': Fix MediaStyle API comments