OSDN Git Service

am e05762a5: am 8e6435ea: Merge "Add defines for CAIF support"
authorDavid Turner <digit@android.com>
Tue, 7 Dec 2010 00:44:46 +0000 (16:44 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Dec 2010 00:44:46 +0000 (16:44 -0800)
commitbd4ab138d833fe9d90ccff9ea0addb503246ca6f
tree618bd6bbec8138b174a213d204b6a6a4190073e4
parent5d7995be2496fd4288563e26fc5864372dc93cdb
parente05762a5312261b96d20597eb6c3a61abaeac2cf
am e05762a5: am 8e6435ea: Merge "Add defines for CAIF support"

* commit 'e05762a5312261b96d20597eb6c3a61abaeac2cf':
  Add defines for CAIF support