| commit | 6e549d1c99ac41e44f30c8408f4b5382a0d281cb | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Mon Aug 23 19:01:03 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 23 19:01:03 2010 -0700 |
| tree | b740d5041b6588ee506110f00385b861f0da8d75 | |
| parent | 976b71e2e0a2041ad159c782f07e1a4d1a06aefd [diff] | |
| parent | f467ca08dda9efece674efb0cc70c45fab4973a6 [diff] |
am f467ca08: Merge "More watermark work." into gingerbread Merge commit 'f467ca08dda9efece674efb0cc70c45fab4973a6' into gingerbread-plus-aosp * commit 'f467ca08dda9efece674efb0cc70c45fab4973a6': More watermark work.