tree f558ea119d1aae426c7889f08f4982544451b856
parent 5b1a2b075f42b2282cb1d0f0bdd08df74aafb89b
parent 5c4c113ab77f99bc02d9b0b58de7290609866a2f
author Eric Laurent <elaurent@google.com> 1427316001 +0000
committer android-build-merger <android-build-merger@google.com> 1427316001 +0000

am c42c4b52: (-s ours) am 424324b3: am 2fdd16b3: DO NOT MERGE - audio policy service: fix possible memory overflow
automerge: 5c4c113  -s ours

* commit '5c4c113ab77f99bc02d9b0b58de7290609866a2f':
  DO NOT MERGE - audio policy service: fix possible memory overflow