OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba7ce02 076e660)
am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
authorJaikumar Ganesh <jaikumar@google.com>
Fri, 27 May 2011 20:46:50 +0000 (13:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 27 May 2011 20:46:50 +0000 (13:46 -0700)
* commit '1b755dea38cc428a4adb8b8954bbafaa9c0441fb':
  Remove discoverable timeout handler. DO NOT MERGE


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