OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9464f9c 09b18c2)
am 09b18c2f: (-s ours) am 79a97489: (-s ours) am dbe09da6: DO NOT MERGE: Respond...
authorAndreas Huber <andih@google.com>
Wed, 16 Feb 2011 22:31:27 +0000 (14:31 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Feb 2011 22:31:27 +0000 (14:31 -0800)
* commit '09b18c2f1d5ca6cf25352ae633f2121556a516ab':
  DO NOT MERGE: Respond to RTSP server->client requests.


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