tree b0b123e792cceac6e59f7cc68b85fd175aad267c
parent 786012b229cfc46f78aa1473a3afbb292dd03a4d
parent 670ecc22790269b8d8383831fdd5eba3b637675a
author Andre Eisenbach <eisenbach@google.com> 1519340535 +0000
committer android-build-merger <android-build-merger@google.com> 1519340535 +0000

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

Change-Id: I9a7a7712d750581cec4131489bca7071ad64ceee