tree 71c0156e633fa0f534f038964d1f567f8a35d95c
parent ed5b8c06bbc70facbe553a9ca257a277ac3758ca
parent 84e6bc61c64aa578aed50460f7e4f16d85f81cbb
author Ricardo Cervera-Navarro <rcervera@google.com> 1397848085 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397848085 +0000

am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs

* commit '84e6bc61c64aa578aed50460f7e4f16d85f81cbb':
  Revert "docs: Watermark images with easter eggs"