tree 679d00ea3d06c44b0fbcb4cbf21b9f08f08b8265
parent 30c04c0b2929f5aee02b8c64af2af01f8073de0c
parent 95aafa21558dfc8605c5e804b429797f1085abcd
author Android Build Merger (Role) <android-build-merger@google.com> 1484867725 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1484867725 +0000

Merge changes from topic 'am-c912808ef06040968a6a3578778fd0b5' into nyc-mr2-dev-plus-aosp

* changes:
  Revert "Revert "Revert "Path fix for backend connection to FE upon call disconnection""" am: bd6ca81fa3 am: 2205dad1ff am: 8e5e4d6f16
  Revert "audio: fix headset + speaker path" am: 9388a729d0 am: 3925384f9d am: 13bbc9b421