tree 901aef54ec25d9cd01fa16f7c6536cf05b3c3d02
parent 2722e40f53f4f714d654bf145d6c471cc9b9978d
parent aa521d868f80eb3d268dfe7a5d9f8136ce449906
author Etan Cohen <etancohen@google.com> 1488985825 +0000
committer android-build-merger <android-build-merger@google.com> 1488985825 +0000

Merge "[AWARE] Add data-path security configuration (Passphrase)" am: df5dc451ff
am: aa521d868f

Change-Id: I77cdcd125fe3389b1fc5210baa0f694dd8058cc1