OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3073b34 17ba3de)
am e4dd154c: Merge "hange the default IsoDep timeout to 300ms (docs update)." into...
authorNick Pelly <npelly@google.com>
Wed, 19 Jan 2011 00:16:36 +0000 (16:16 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 Jan 2011 00:16:36 +0000 (16:16 -0800)
* commit 'e4dd154c08b04090bad8f450450e13163d5fef9b':
  hange the default IsoDep timeout to 300ms (docs update).


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