tree 3047d4dd30b59a97ddfbd079fcb00252fe79ce67
parent e4cf272967d6cbfc8e9e7c5c2756651e306a2755
parent 6dea46b2e567f614244100f542dce04e44c26bee
author Ricardo Cervera <rcervera@google.com> 1391534980 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391534980 +0000

am 6dea46b2: am f7c12817: am b180bff5: am ccec0906: Merge "docs: Added note on multiple build.gradle files. Bug: 12870006" into klp-docs

* commit '6dea46b2e567f614244100f542dce04e44c26bee':
  docs: Added note on multiple build.gradle files. Bug: 12870006