diff options
author | Jeff Hamilton <jham@android.com> | 2011-05-25 16:32:12 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-25 16:32:12 -0700 |
commit | 7c324a3f7dde4be26b7a996b485a92ba25de3251 (patch) | |
tree | b20f506c5f7aeb87359346bdabdfdd9c3f0e3b79 /docs/html/sdk/api_diff/8/changes | |
parent | fce12613edc5c0550b73cd9af66fa9651fc0ea1e (diff) | |
parent | 5e654d02457e0f90f8cdaf07843af1be7328ed7f (diff) |
am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2
* commit '5e654d02457e0f90f8cdaf07843af1be7328ed7f':
Swap Mifare for MIFARE.
Diffstat (limited to 'docs/html/sdk/api_diff/8/changes')
0 files changed, 0 insertions, 0 deletions