tree 82330bb453501aa520cbb7b0716c0c0c88326ff5
parent c571709b287469bea052b4618d3b119ff1794883
parent e2e64dff917335dcbb6c0c81ebccf41854522039
author Jack He <siyuanh@google.com> 1495659385 +0000
committer android-build-merger <android-build-merger@google.com> 1495659385 +0000

Merge "MCAP: Add test interface ID (1/2)" am: 9dbf14a312 am: d7d66b117d am: 1495e0996e
am: e2e64dff91

Change-Id: Iabbc56ba033d7262aa7d694de479b8baebb760cc