Commits
Dianne Hackborn authored and Android Git Automerger committed 773b769a7e2M
am 6e549d1c: am f467ca08: Merge "More watermark work." into gingerbread Merge commit '6e549d1c99ac41e44f30c8408f4b5382a0d281cb' * commit '6e549d1c99ac41e44f30c8408f4b5382a0d281cb': More watermark work.
Showing diff to91047d3b2c0