OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2a605a 14019ab)
am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2
authorJeff Hamilton <jham@android.com>
Wed, 25 May 2011 22:41:51 +0000 (15:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 May 2011 22:41:51 +0000 (15:41 -0700)
* commit '14019abb40785064ebef5d14e82586a910d33181':
  Swap Mifare for MIFARE.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help