OSDN Git Service

Merge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43
authorEtan Cohen <etancohen@google.com>
Wed, 1 Mar 2017 17:49:32 +0000 (17:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Mar 2017 17:49:32 +0000 (17:49 +0000)
commit756216fdf9ca083f41fa2cb35c5df75adcaee3d3
treeba7443615340d50cc2ca5759e4a8cde99bec3ad5
parent63700b7a8f1d2f6250de39e06fa6a984eb487c4d
parentb50d958c4a0a963e7c1be86b10f14b3073d35240
Merge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43
am: b50d958c4a

Change-Id: I99cdde15f3ea9dc4630ccd09a242f3a1148d33bb