OSDN Git Service

am afc51b92: am c4dbc16e: Merge "Make cpp.py less braindead."
authorElliott Hughes <enh@google.com>
Thu, 7 Nov 2013 00:10:12 +0000 (16:10 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 Nov 2013 00:10:12 +0000 (16:10 -0800)
* commit 'afc51b92a0e531f05e0e5477ea857a8669e5e5d1':
  Make cpp.py less braindead.


Trivial merge