OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d0499c4 610b7f2)
am 9e5d0de9: (-s ours) am b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection...
authorJaikumar Ganesh <jaikumar@google.com>
Tue, 21 Jun 2011 21:08:29 +0000 (14:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 21 Jun 2011 21:08:29 +0000 (14:08 -0700)
* commit '9e5d0de9a333683533a021e9733e824cac666d18':
  DO NOT MERGE Incoming Bluetooth Connection requests - dialog.


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