commit | a0e300efae92d8155151e345034620054cff8955 | [log] [tgz] |
---|---|---|
author | Glenn Kasten <gkasten@android.com> | Wed Mar 19 21:15:41 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 19 21:15:41 2014 +0000 |
tree | 1728e97892130b72073a50fa7bdb7a986e1a7545 | |
parent | 4f346bf0ffe1c596ca261dfec23c50977de77d82 [diff] | |
parent | 458edc8de368607a1cf831f7e8bb70047c8bf905 [diff] |
am 458edc8d: am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." * commit '458edc8de368607a1cf831f7e8bb70047c8bf905': mediaeditor shouldn't depend on audioflinger.