| commit | 29427a224e78068ade12bbabcf5613ce9cd48bfc | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@android.com> | Wed Mar 19 21:22:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 19 21:22:09 2014 +0000 |
| tree | 67e19893ea1c1648f7b5835891557150fe3fb743 | |
| parent | 5341f881e0372c1c2af570d42fbe61a6500f315c [diff] | |
| parent | a0e300efae92d8155151e345034620054cff8955 [diff] |
am a0e300ef: am 458edc8d: am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." * commit 'a0e300efae92d8155151e345034620054cff8955': mediaeditor shouldn't depend on audioflinger.