tree 9f2abbf19a48bd93c1c0226bbf3789faf6aa0373
parent 631ea26c492da8673a1ee5f96b4d50eb4b27969d
parent 08e9d528171201be2a5641b8af431a2b9c745dc5
author Etan Cohen <etancohen@google.com> 1488986148 +0000
committer android-build-merger <android-build-merger@google.com> 1488986148 +0000

Merge "[AWARE] Add data-path security configuration (Passphrase)" am: 769fa0c881 am: 0501c50040
am: 08e9d52817

Change-Id: I9e2cae82179316a6768fa43a7f313c32470fd40a