OSDN Git Service

am c4dbc16e: Merge "Make cpp.py less braindead."
authorElliott Hughes <enh@google.com>
Wed, 6 Nov 2013 20:34:22 +0000 (12:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 6 Nov 2013 20:34:22 +0000 (12:34 -0800)
* commit 'c4dbc16eb03bcc0a3ea04cd32ce7551ad94b2bfc':
  Make cpp.py less braindead.


Trivial merge