OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2aaa7e9 40480f7)
Merge commit '5e3562a5' into m
authorConley Owens <cco3@android.com>
Wed, 27 Apr 2011 23:58:24 +0000 (16:58 -0700)
committerConley Owens <cco3@android.com>
Wed, 27 Apr 2011 23:58:24 +0000 (16:58 -0700)
Conflicts:
core/java/android/view/ViewRoot.java

Change-Id: Idd1eb8309e169eae2de3838f7969606df8097b87


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