OSDN Git Service

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

Change-Id: I16d9887f2c82cdcff3dde282bd129232d456dc5a