OSDN Git Service

Merge "[AWARE] Data-path negotiation update" am: a4b9cad4a1
authorEtan Cohen <etancohen@google.com>
Tue, 28 Feb 2017 20:42:28 +0000 (20:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Feb 2017 20:42:28 +0000 (20:42 +0000)
commitf7b018dc47e1d4b4adfaae65fdf5c7fd8aafd0f6
tree2807320e6213297a283e53f2024ba9fb2c1bc4a4
parent93b79bd1729c7929c1fa78bb181755eedce89ba7
parentb4c9402e6b68bff3cde75194daeb191ec66352da
Merge "[AWARE] Data-path negotiation update" am: a4b9cad4a1
am: b4c9402e6b

Change-Id: Ib6c1ef62a2819a76095989217f5d8d6bb091bb4b