OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f65407 9ea7f08)
am c8410017: (-s ours) am 1b755dea: Merge "Remove discoverable timeout handler. DO...
authorJaikumar Ganesh <jaikumar@google.com>
Tue, 7 Jun 2011 17:01:28 +0000 (10:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Jun 2011 17:01:28 +0000 (10:01 -0700)
* commit 'c8410017502dacff43ecd3e0926049b99fc186a8':
  Remove discoverable timeout handler. DO NOT MERGE


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