tree e4dec749e58407c0a4f5ba43128544c9c007a53e
parent d5e2fd07c8fc22a40cb81aab4ccf15b64804ab65
parent 9b6ce6994a1b11343d6ea5d4312233b34e1499d9
author Joe Malin <jmalin@google.com> 1381361162 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381361162 -0700

am 9b6ce699: am ead8478a: am 299d57f7: am a3da7e4e: am 48872ee0: Merge "DOC CHANGE: Android Beam training class" into jb-mr2-docs

* commit '9b6ce6994a1b11343d6ea5d4312233b34e1499d9':
  DOC CHANGE: Android Beam training class