OSDN Git Service

am c9af0e9a: am cd1959b0: Merge "Add primitive CPPLINT.cfg."
authorDan Albert <danalbert@google.com>
Thu, 29 Jan 2015 22:06:28 +0000 (22:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Jan 2015 22:06:28 +0000 (22:06 +0000)
* commit 'c9af0e9a2d215b60a128643b6bdddd671e33864b':
  Add primitive CPPLINT.cfg.


Trivial merge