tree bc92279a8c7b5943e67a3db3f3393bb25b36c559
parent ff1e1d99ea029197051b3cdaa39effc6baa94b53
parent a3dc076d2dda77d8891fcd83f6f4056d15bbf2fc
author Glenn Kasten <gkasten@android.com> 1395263441 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395263441 +0000

am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."

* commit 'a3dc076d2dda77d8891fcd83f6f4056d15bbf2fc':
  mediaeditor shouldn't depend on audioflinger.