tree ff4c0e79710e99c0ca8cfa31b317908fadb9809e
parent 6116bf22455071d4ae98aeb26e78202a390228c1
parent 8c093d5d2a6695cda888827a506633da922ad543
author Android (Google) Code Review <android-gerrit@google.com> 1243265782 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1243265782 -0700

am 8c093d5d: Merge change 2085 into donut

Merge commit '8c093d5d2a6695cda888827a506633da922ad543'

* commit '8c093d5d2a6695cda888827a506633da922ad543':
  This fixes the build to always define the ANDROID macro, and remove an empty -I from the compiler options.