tree 5bae7d5985563f2cbbf9cc9cc1a5fca422cb8390
parent 7957cf094ae4d6c88f535a8f9c4833fb9eaf449f
parent 151b3f41ffcdf187580542ba0c0d3b84df16beed
author Eric Laurent <elaurent@google.com> 1414851285 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414851285 +0000

am 151b3f41: am aa751488: am 5987e7ae: am ca83dd27: (-s ours) am 42f785c5: am 4fbe49a8: am 96016c2d: am 9944ff09: am 70c3507d: am 450b10c9: am d0f9dc71: am e0a65f30: am f5af3a72: am 6d80b687: audio policy: validate stream type received from binder calls.

* commit '151b3f41ffcdf187580542ba0c0d3b84df16beed':
  audio policy: validate stream type received from binder calls.