OSDN Git Service

am 95b5c3de: am e76d9e6b: Fix erroneous comment in secdiscard.cpp, plus style fixes.
authorPaul Crowley <paulcrowley@google.com>
Tue, 14 Jul 2015 15:50:04 +0000 (15:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 15:50:04 +0000 (15:50 +0000)
* commit '95b5c3dedcec60ea8d31c192592e0cfdc26af730':
  Fix erroneous comment in secdiscard.cpp, plus style fixes.


Trivial merge