tree f8af33d109a4c4d2e368fa3c7e26da2b3cf981df
parent a8c4b207ff9de880ed75d509e4bc28d2b809efc3
parent 1fb1359af80e49222cd0082f336150c99d57322e
author TreeHugger Robot <treehugger-gerrit@google.com> 1541095443 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1541095443 +0000

Merge changes from topic "am-6595535a-66ae-4551-9774-048441013dbf" into oc-dev

* changes:
  [automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: 10e0027a56 am: bdceca1df5 am: 32040fc6fc am: f4b987320a skipped: c807bd5d50
  [automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: 10e0027a56 am: bdceca1df5 am: 32040fc6fc am: f4b987320a
  [automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: 10e0027a56 am: bdceca1df5 am: 32040fc6fc
  [automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: 10e0027a56 am: bdceca1df5
  [automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: 10e0027a56
  DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data