tree 87277cc0f2351b82ce3e09914ebc4b90fc730751
parent 46bf60990be863db9fde3684aa58993518a263fe
parent 61b16b3f02de2bf10c68f83b1c878c8c5ac5dfb6
author Amit Mahajan <amitmahajan@google.com> 1491947056 +0000
committer android-build-merger <android-build-merger@google.com> 1491947056 +0000

Merge "Add p2 option in OpenLogicalChannel" am: 7b3d8dd351
am: 61b16b3f02

Change-Id: I6ae82f5e4707b19753235eaa8bc4203b3181adfc