tree 5c4404f70b35f1c95cf12e6d61fb160b18529e9b
parent 5a9d721baece3144ec3b9f43715d1c112d90b3d6
parent 24e3e831199e1279b3a12b0ccfeb00e06d4f4fd5
author Mike Lockwood <lockwood@google.com> 1412623720 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412623720 +0000

am 24e3e831: am 7569b7b3: Merge "Add bootanimation to audio group so it can play boot sound" into lmp-dev

* commit '24e3e831199e1279b3a12b0ccfeb00e06d4f4fd5':
  Add bootanimation to audio group so it can play boot sound