tree 736630d66733685123fe5bb5b096061f034605ae
parent d13ac3c727950ef4ce4a32d50ab83a12d2f3ea78
parent dc0ac4fa83e563174fa4d3b1cdbda75d33aa8573
author Jordan Liu <jminjie@google.com> 1552943939 -0700
committer android-build-merger <android-build-merger@google.com> 1552943939 -0700

[automerger skipped] Merge "Add slot based ICC channel APIs" am: e278d2bcdd am: ca075c3176
am: dc0ac4fa83 -s ours
am skip reason: change_id I3f47a8ac07813ea9e326c7d76123352708bfeea2 with SHA1 04c28872d1 is in history

Change-Id: I46448919190fa47873183d33924f0b283234ddee