tree 3b6de4d79bc3857b5fd60ad4d14f946e1c9e1137
parent 9d71ca593fa07a4b016c9c557f5a21fcced2948c
parent a6d0350de6475d8e8eea961eac8a4cea9474c740
author Android Build Merger (Role) <android-build-merger@google.com> 1502852329 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502852329 +0000

Merge "AudioService: device connection intent: never send null action am: 87a264dfde am: 305151cbae" into oc-mr1-dev-plus-aosp