commit | ab80f2aea55b26f593a3e57ed3516c4667d516f0 | [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 | 4e2e82d02f17f140775c286aaa41f23769c4fb18 | |
parent | 63301fe5b095c991f041574c4023d46af48c4391 [diff] | |
parent | af2ac558a47d2f69c69755e0ac95b792bd0f1f3b [diff] |
Merge "More watermark work." into gingerbread