tree f804da509d49250933d1a9ec12c9c81e9f13207d
parent b11d7c3eca0e5bc04c14afe82a530429f173706c
parent 8e6435ead5b118f1fd458d4acbdd0bf86754ab1b
author David Turner <digit@android.com> 1291671103 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291671103 -0800

am 8e6435ea: Merge "Add defines for CAIF support"

* commit '8e6435ead5b118f1fd458d4acbdd0bf86754ab1b':
  Add defines for CAIF support