tree b7bb591c3e6f1beb8763f6efb4db4c7a96d983d9
parent b108091734ee7668084cc1063187c2b10ddb7bb7
parent ad71caf25e31ecfc4ecf2c925e38fd87905fbc8e
author Elliott Hughes <enh@google.com> 1400722340 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400722340 +0000

am ad71caf2: am 3b6da6bf: Merge "Move frameworks/av off private API."

* commit 'ad71caf25e31ecfc4ecf2c925e38fd87905fbc8e':
  Move frameworks/av off private API.