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)
commitfad3b31234b78b677e78081ca95ce35e5bfba801
tree62c47178b8aeae3de0c3a0546279dd54598c3832
parent677a7b30ce15698acd463eecfccc10c1b2622511
parent4ba6a7d3ddc3ce828a69770545c28d6e5eeba248
Merge "[AWARE] Data-path cipher API correction"
am: 4ba6a7d3dd

Change-Id: Ie9b3a5be561bd2f7db0218d4d5914527f1384c47