OSDN Git Service

Merge "[AWARE] Data-path cipher API correction"
authorEtan Cohen <etancohen@google.com>
Tue, 28 Feb 2017 14:11:02 +0000 (14:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Feb 2017 14:11:02 +0000 (14:11 +0000)
am: 4ba6a7d3dd

Change-Id: Ie9b3a5be561bd2f7db0218d4d5914527f1384c47


Trivial merge