tree b9a00b7ea4a441da95f937113b2ee6a8dc3c29cf
parent a473027da92ed4059b70224579b218eace083fcb
parent 299d57f7dfeb291460f68a0f702161847467fd1e
author Joe Malin <jmalin@google.com> 1381360781 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381360781 -0700

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

* commit '299d57f7dfeb291460f68a0f702161847467fd1e':
  DOC CHANGE: Android Beam training class