tree 49056ae9a24ba71cadba03cc0a7329beafafb56f
parent f239a76c156e386d5464dac49a1718a91c9c24d4
parent 73117424029ce1983f2f0a2f706d08e1f5870955
author Scott Main <smain@google.com> 1354298479 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354298479 -0800

am 73117424: am 580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev

* commit '73117424029ce1983f2f0a2f706d08e1f5870955':
  docs: gms and gcm javadocs