tree 4fbee973e6a771ed3c2e3d800adc10fd424bb46f
parent c76ba85e166fa98baf44102894471c483f134c17
parent afc51b92a0e531f05e0e5477ea857a8669e5e5d1
author Elliott Hughes <enh@google.com> 1383783012 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383783012 -0800

am afc51b92: am c4dbc16e: Merge "Make cpp.py less braindead."

* commit 'afc51b92a0e531f05e0e5477ea857a8669e5e5d1':
  Make cpp.py less braindead.