OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b9b071 f91a2f0)
am 8bf89f30: (-s ours) Fix the build
authorJohn Reck <jreck@google.com>
Fri, 21 Oct 2011 22:22:11 +0000 (15:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Oct 2011 22:22:11 +0000 (15:22 -0700)
* commit '8bf89f305eb3a2010b1a63048a4aa18ccbc42e78':
  Fix the build


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