| commit | f362260d34936e1ecb7095e250743e9d01c5a254 | [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 | 85f48fd8e5576feecb15939f81e6af4bbe1942fc | |
| parent | 1f4f571329dc55575dfa5d19174799b2092848c9 [diff] | |
| parent | ab80f2aea55b26f593a3e57ed3516c4667d516f0 [diff] |
am f467ca08: Merge "More watermark work." into gingerbread Merge commit 'f467ca08dda9efece674efb0cc70c45fab4973a6' into gingerbread-plus-aosp * commit 'f467ca08dda9efece674efb0cc70c45fab4973a6': More watermark work.