OSDN Git Service

Merge "[AWARE] Add data-path security configuration (Passphrase)" am: 769fa0c881
authorEtan Cohen <etancohen@google.com>
Wed, 8 Mar 2017 15:10:18 +0000 (15:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Mar 2017 15:10:18 +0000 (15:10 +0000)
commit08e9d528171201be2a5641b8af431a2b9c745dc5
tree6ab82eaadfa8c0c9a1d809f2941bedf30d9fbe38
parent48a78f4852132cd0161538922bc0651e55e232a5
parent0501c50040f1ed37391d53825c6bd4e03791b490
Merge "[AWARE] Add data-path security configuration (Passphrase)" am: 769fa0c881
am: 0501c50040

Change-Id: Id7d33f9fc01e30e62dd765ceedd929506a9cd5b5