tree 831a35eee3054311e7984239e6a338340e1aeda2
parent eaa6d142d976d713b18b1ba4abfd37f62da9db90
parent fac3264c26f05181d24cbf7d3b694871fe8885c2
author Jordan Liu <jminjie@google.com> 1552943989 -0700
committer android-build-merger <android-build-merger@google.com> 1552943989 -0700

Merge "Add slot based ICC channel APIs" am: 2fe83d4724 am: 50d1deafb2
am: fac3264c26

Change-Id: Ibdfcddcb7ed9470580da3a996c44b7591dacd050