tree 4d8a3025e344c748d674e4ca0048bda360b81f6d
parent fe449deb5a101e0abaa244167d82b17af55d6c17
parent 4f5c3ad099eac808d01d4e1156c0f8b41d23989b
author Jordan Liu <jminjie@google.com> 1562795038 -0700
committer android-build-merger <android-build-merger@google.com> 1562795038 -0700

Merge "Use setChannelId instead of setChannel" am: e9fb7cf1da am: 7c9488ae79 am: 896b63cab9
am: 4f5c3ad099

Change-Id: I73cc598b4dbed1aec06484335a0589692fc85b2b