OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2aaa7e9
40480f7
)
Merge commit '5e3562a5' into m
author
Conley Owens
<cco3@android.com>
Wed, 27 Apr 2011 23:58:24 +0000
(16:58 -0700)
committer
Conley 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