| commit | fea39c6e467559f1ad72c0c00975fd61bad090c6 | [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 | 9535013ef46bc8c2bb119e23ead0c28f5b894a94 | |
| parent | ae5f1dfe42a961bb9ac100c72c40028a49636782 [diff] | |
| parent | f362260d34936e1ecb7095e250743e9d01c5a254 [diff] |
am 6e549d1c: am f467ca08: Merge "More watermark work." into gingerbread Merge commit '6e549d1c99ac41e44f30c8408f4b5382a0d281cb' * commit '6e549d1c99ac41e44f30c8408f4b5382a0d281cb': More watermark work.