tree 729ba3b39dcbc29fe1dcf4ec7ec7b3bb0a9f5b8a
parent 17c2c87c40588fe77c327bb4dd57460aad90731c
parent 8e2b445fabd05132de57226de71c7860a5391954
author Eric Laurent <elaurent@google.com> 1415670194 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415670194 +0000

am 8e2b445f: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessing automerge: 99370d2 automerge: cb5c8c0

* commit '8e2b445fabd05132de57226de71c7860a5391954':