Commits
Dianne Hackborn authored and Android Git Automerger committed 9185e26a8f0M
am fb86ce93: Add watermark support. Merge commit 'fb86ce93079db4465a61489275c65bcf8ce4669e' into gingerbread-plus-aosp * commit 'fb86ce93079db4465a61489275c65bcf8ce4669e': Add watermark support.
Showing diff to70a7c92e161