tree 1d41d46df7ebc6f2bb85f7923bcfab84428b21dc
parent 247b89690300af9d79fd0292ab3592618eb9c0bf
parent 54a7b9325bfb55d124dd66534a2fdca60093ea7e
author Robert Ly <robertly@google.com> 1403399805 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403399805 +0000

am 54a7b932: am 50f08149: Merge "docs: add whitelisting instructions and new index icons" into klp-modular-dev

* commit '54a7b9325bfb55d124dd66534a2fdca60093ea7e':
  docs: add whitelisting instructions and new index icons