| commit | 0237d04b9564b9ef3e443091a4bce7dc5a2f1826 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jun 08 10:57:12 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 08 10:57:12 2012 -0700 |
| tree | ed5aaf33aaf45e9d53f974d6b8b6fe0358d41ca4 | |
| parent | bd0edb479f212746ea1265c7bf57d1382d337fad [diff] | |
| parent | 644e43e06ffa5b493ca3682c24b8db606deed664 [diff] |
am 644e43e0: am 3e3d641c: Merge "Added mpga as valid MediaFile extension" * commit '644e43e06ffa5b493ca3682c24b8db606deed664': Added mpga as valid MediaFile extension