OSDN Git Service

[automerger skipped] Merge "Add CallAudioState ctor as TestApi" am: 39ac9ffe27 am...
authorHall Liu <hallliu@google.com>
Wed, 30 May 2018 23:02:11 +0000 (16:02 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 May 2018 23:02:11 +0000 (16:02 -0700)
commit54b3157ffb163ead59750ed9ad19774fa5f05d66
treeebcd1213d1961f892068b684fda678cc1f67edcc
parent2ab2eca7906762c5a1b0e6b6cd15101e30c5cfc5
parent1d09efefebab4915e78dd06ba977c7ded4a46ab7
[automerger skipped] Merge "Add CallAudioState ctor as TestApi" am: 39ac9ffe27 am: f06c6d0187  -s ours
am: 1d09efefeb  -s ours

Change-Id: I3ce9e1d994c4f686d881a3a322ef8a5c40187334