| commit | 9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Wed Aug 11 22:04:27 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 11 22:04:27 2010 -0700 |
| tree | 2c8e4ee7154493cec0db4a1e62a4e3b6c1a20cd2 | |
| parent | 70a7c92e161225f587af453e01d2b124dbf6303f [diff] | |
| parent | fb86ce93079db4465a61489275c65bcf8ce4669e [diff] |
am fb86ce93: Add watermark support. Merge commit 'fb86ce93079db4465a61489275c65bcf8ce4669e' into gingerbread-plus-aosp * commit 'fb86ce93079db4465a61489275c65bcf8ce4669e': Add watermark support.