| commit | 773b769a7e2ac82384a620f1338d5e9035f43a5b | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Tue Aug 24 11:54:49 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 24 11:54:49 2010 -0700 |
| tree | bcebdfab669752608c6517eab626c6f6c735b1f2 | |
| parent | 91047d3b2c08aa478b4c873edc45cb6af92371a0 [diff] | |
| parent | 6e549d1c99ac41e44f30c8408f4b5382a0d281cb [diff] |
am 6e549d1c: am f467ca08: Merge "More watermark work." into gingerbread Merge commit '6e549d1c99ac41e44f30c8408f4b5382a0d281cb' * commit '6e549d1c99ac41e44f30c8408f4b5382a0d281cb': More watermark work.