OSDN Git Service

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)
commitf362260d34936e1ecb7095e250743e9d01c5a254
tree85f48fd8e5576feecb15939f81e6af4bbe1942fc
parent1f4f571329dc55575dfa5d19174799b2092848c9
parentab80f2aea55b26f593a3e57ed3516c4667d516f0
am f467ca08: Merge "More watermark work." into gingerbread

Merge commit 'f467ca08dda9efece674efb0cc70c45fab4973a6' into gingerbread-plus-aosp

* commit 'f467ca08dda9efece674efb0cc70c45fab4973a6':
  More watermark work.