OSDN Git Service

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

Change-Id: I90b6324a903b6307c084c891d7eba75957e13886


Trivial merge