| commit | ec818c6f4aa4d3df4fa323a92c2b022ac65ae4cb | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Tue Aug 20 11:30:29 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 20 11:30:29 2013 -0700 |
| tree | a8018f65c5cceb4a32ab0ae9d6fda5e06c4808d1 | |
| parent | 38a310aa0a6e281584299da7d1a578723f0ccd60 [diff] | |
| parent | 1cb4d42c562fc53bee7779815b6c791f9aa00b3e [diff] |
am 1cb4d42c: am a3132d97: Merge "MediaPlayer.TrackInfo: add getFormat() method" into klp-dev * commit '1cb4d42c562fc53bee7779815b6c791f9aa00b3e': MediaPlayer.TrackInfo: add getFormat() method