| commit | fa30e18083e2c3a27154440149513d42b37b2829 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jun 08 11:01:01 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 08 11:01:01 2012 -0700 |
| tree | 021ef65c384f8c4681fc9bc95aa9e2744f91d0b1 | |
| parent | 2828b8affdce2c8bc6b889253ed4ffb582aebc78 [diff] | |
| parent | 0237d04b9564b9ef3e443091a4bce7dc5a2f1826 [diff] |
am 0237d04b: am 644e43e0: am 3e3d641c: Merge "Added mpga as valid MediaFile extension" * commit '0237d04b9564b9ef3e443091a4bce7dc5a2f1826': Added mpga as valid MediaFile extension