OSDN Git Service

Merge "[AWARE] Add Passphrase data-path security" am: 9e71d7d44f am: 5a05398da8
authorEtan Cohen <etancohen@google.com>
Thu, 23 Mar 2017 00:31:04 +0000 (00:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 23 Mar 2017 00:31:04 +0000 (00:31 +0000)
am: e3ee58a4e7

Change-Id: I86680b7dc7285658d5b71a8e8bc5fbf504522b96


Trivial merge