tree 31f8bd8052aa486a43499dc5d0e11dc56e502083
parent b455f0deed3dd38dea5c89984d1c0e47f17cbf08
parent eff6f4fc43fb8aec7b3f6a232057a7cdfe6808c9
author Etan Cohen <etancohen@google.com> 1488390342 +0000
committer android-build-merger <android-build-merger@google.com> 1488390342 +0000

Merge "[AWARE] Add data-path security configuration (PMK)"
am: eff6f4fc43

Change-Id: I90b6324a903b6307c084c891d7eba75957e13886