tree 92240a5afa5eb1a6d6527a4e99fa4de07a439af8
parent cbfd4c1c64b198a93f2b80f5189853e422570f2c
parent e2dbc3547886465bd4782c8f0aa046c47bc98a1d
author Glenn Kasten <gkasten@android.com> 1389653653 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389653653 -0800

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

* commit 'e2dbc3547886465bd4782c8f0aa046c47bc98a1d':