OSDN Git Service

resolve merge conflicts of 8e6f6a5 to oc-dr1-dev-plus-aosp
authorPaul Crowley <paulcrowley@google.com>
Wed, 28 Jun 2017 23:08:04 +0000 (16:08 -0700)
committerPaul Crowley <paulcrowley@google.com>
Wed, 28 Jun 2017 23:09:00 +0000 (16:09 -0700)
commit071120776a023a726dbdcb2ca6fa5293367f0281
treef06d811d47b6c0038eac5a16f143faa56d9a12c8
parentbd40570e257a05b6c197241a52ff1194ffde0ff7
parent8e6f6a5cebf023905b37b0fc80d3ceec262a0d91
resolve merge conflicts of 8e6f6a5 to oc-dr1-dev-plus-aosp

Test: None
Change-Id: Icf7654b3200a4afd104f31aff8ce5b09867b7182
KeyUtil.cpp
KeyUtil.h