OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98019c1 637742c)
am c6a0277b: am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1
authorNick Pelly <npelly@google.com>
Thu, 17 Nov 2011 23:12:56 +0000 (15:12 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Nov 2011 23:12:56 +0000 (15:12 -0800)
* commit 'c6a0277bca29359ec1aee123495065982d2eea7a':
  Fix NPE on devices that don't have NFC.


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