OSDN Git Service

[automerger skipped] Merge "Add CallAudioState ctor as TestApi" am: 39ac9ffe27
authorHall Liu <hallliu@google.com>
Wed, 30 May 2018 22:28:18 +0000 (15:28 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 May 2018 22:28:18 +0000 (15:28 -0700)
commit1d09efefebab4915e78dd06ba977c7ded4a46ab7
treefb381fc43496b14af2d444b7e9c16503522b2982
parent56eaecd57d56e5fab3aea29c426f858018503ebb
parentf06c6d018728cca7cf8edab1b250f74ceef80f74
[automerger skipped] Merge "Add CallAudioState ctor as TestApi" am: 39ac9ffe27
am: f06c6d0187  -s ours

Change-Id: Ic6ae00ffdf13aff3b3c081c2b00cefbfa1412d6f