OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f4f571 ab80f2a)
am f467ca08: Merge "More watermark work." into gingerbread
authorDianne Hackborn <hackbod@google.com>
Tue, 24 Aug 2010 02:01:03 +0000 (19:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Aug 2010 02:01:03 +0000 (19:01 -0700)
Merge commit 'f467ca08dda9efece674efb0cc70c45fab4973a6' into gingerbread-plus-aosp

* commit 'f467ca08dda9efece674efb0cc70c45fab4973a6':
  More watermark work.


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