tree 893a88f056d27c6473aed453f4c772a7ab4c4995
parent 30603d7bf6636c79847ab898bd585f8dad24d6b9
parent 54f104e84c956bbbb06adb68c4ffcbadaea47503
author Andre Eisenbach <eisenbach@google.com> 1519341507 +0000
committer android-build-merger <android-build-merger@google.com> 1519341507 +0000

Merge "Add AudioManager.setHearingAidDeviceConnectionState" am: c3e842fde8 am: 670ecc2279
am: 54f104e84c

Change-Id: I145b732008e979b7c9762e366620f9fd6c15a97f