tree d6133231acfa2bd6c93c44699d2abe9849ac5008
parent 59aac93e393c5d25510eaa903dd3af3134601e08
parent 3223d0ea38a84504f412581eb2fd7276e3dd9d0a
author Amit Mahajan <amitmahajan@google.com> 1492037645 +0000
committer android-build-merger <android-build-merger@google.com> 1492037645 +0000

Merge "Add p2 option in OpenLogicalChannel" into oc-dev am: ddeb776201  -s ours
am: 3223d0ea38  -s ours

Change-Id: Ie78679bbb4f4789f4c25704f9560665adfc2ff54