| commit | 5caaf378d845c8e0453e10f89d7f5d6b339e474d | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Wed Aug 11 22:10:07 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 11 22:10:07 2010 -0700 |
| tree | c816d94f678e8c7bb165c0ec3af96460f4d35c46 | |
| parent | 65d79fbe55c017edd9419ddb71939c8916471390 [diff] | |
| parent | 9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e [diff] |
am 9185e26a: am fb86ce93: Add watermark support. Merge commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e' * commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e': Add watermark support.