tree fb9eb4628ce920f31c2b1a7d8855349e44beb3c1
parent e7d825d8b2a256ec6303f26318387538964c79f6
parent adfbc5b25559392ce40abb75df2cd8858dcd8835
author Glenn Kasten <gkasten@google.com> 1384282176 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384282176 -0800

am adfbc5b2: am 8a0d133c: Merge "Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)" into klp-dev

* commit 'adfbc5b25559392ce40abb75df2cd8858dcd8835':
  Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)