| commit | f467ca08dda9efece674efb0cc70c45fab4973a6 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Mon Aug 23 18:57:37 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 23 18:57:37 2010 -0700 |
| tree | 1c21ca938a4c44914828d6783b4a39197fd779d9 | |
| parent | afdc85f65d2952d3ec3be5e1ae2c4209938fc196 [diff] | |
| parent | b9fb1705e805b7074f5ccc3bf398181706854bfb [diff] |
Merge "More watermark work." into gingerbread