tree cd177d5ffba6329e13eb621b8dd0a7f75fb47dc1
parent f915ccf2aeebf4b2b7e3e6104593655db42ab483
parent 7c9488ae796d68c281cd5e91482c918679ddeceb
author Jordan Liu <jminjie@google.com> 1562792899 -0700
committer android-build-merger <android-build-merger@google.com> 1562792899 -0700

Merge "Use setChannelId instead of setChannel" am: e9fb7cf1da
am: 7c9488ae79

Change-Id: Ibc0722b84e3fd5d8cde47747a5a001e325673c7f