tree 42d00cdebe5d485bd11da52c5d4eed872663689d
parent 2735a39c4ed90a4782961a6e4d224a913c065ca7
parent 004263eda24b672dc4fb42fe2cc931652e4e12ad
author Ricardo Cervera <rcervera@google.com> 1397763793 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397763793 +0000

am 004263ed: am f162266c: am f64feec2: am 4aa68e97: am dc9ca02c: docs: Watermark images with easter eggs

* commit '004263eda24b672dc4fb42fe2cc931652e4e12ad':
  docs: Watermark images with easter eggs