tree 8a8fc75747a5cf7df5c11ff1600baf6a2c6059af
parent 846395a9ba7566486c88c014678b27db2fb28fb2
parent 1bf5abc2758df71796c466ef28e08751d9de5dde
author Glenn Kasten <gkasten@android.com> 1389654250 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389654250 +0000

am 1bf5abc2: am e2dbc354: am 276225d7: am b53d4929: am 978cbe8e: Merge "Docs: Updating README to reflect .jd files and AE"

* commit '1bf5abc2758df71796c466ef28e08751d9de5dde':