OSDN Git Service

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


Trivial merge