OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fce1261 5e654d0)
am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2
authorJeff Hamilton <jham@android.com>
Wed, 25 May 2011 23:32:12 +0000 (16:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 May 2011 23:32:12 +0000 (16:32 -0700)
* commit '5e654d02457e0f90f8cdaf07843af1be7328ed7f':
  Swap Mifare for MIFARE.


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