tree 10a3ce3f8977e7159435723b27ea392a6d0bfcbf
parent ec4bc00674168c78a0adbd6f48e8733e16486558
parent e3e6193ea040a25691b68a780f16ebed3f685d0e
author Ricardo Cervera-Navarro <rcervera@google.com> 1415048527 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415048527 +0000

am e3e6193e: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b automerge: 4687757

* commit 'e3e6193ea040a25691b68a780f16ebed3f685d0e':