tree 618bd6bbec8138b174a213d204b6a6a4190073e4
parent 5d7995be2496fd4288563e26fc5864372dc93cdb
parent e05762a5312261b96d20597eb6c3a61abaeac2cf
author David Turner <digit@android.com> 1291682686 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291682686 -0800

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

* commit 'e05762a5312261b96d20597eb6c3a61abaeac2cf':
  Add defines for CAIF support