OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9354091 cd99c18)
am 3a6f9ded: am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuid...
authorMatthew Xie <mattx@google.com>
Wed, 9 Nov 2011 21:51:01 +0000 (21:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Nov 2011 21:51:01 +0000 (21:51 +0000)
* commit '3a6f9ded543db6cb7a2842540a2b67b0356b21ae':
  Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp


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