tree fb381fc43496b14af2d444b7e9c16503522b2982
parent 56eaecd57d56e5fab3aea29c426f858018503ebb
parent f06c6d018728cca7cf8edab1b250f74ceef80f74
author Hall Liu <hallliu@google.com> 1527719298 -0700
committer android-build-merger <android-build-merger@google.com> 1527719298 -0700

[automerger skipped] Merge "Add CallAudioState ctor as TestApi" am: 39ac9ffe27
am: f06c6d0187  -s ours

Change-Id: Ic6ae00ffdf13aff3b3c081c2b00cefbfa1412d6f