tree 2d5658d37a8aa3077fee50fd9603ec294dd5b19c
parent 7f05beb125a0270fee58a96b533baf97536d8b7e
parent 0988f445a1b802f56ff7576d34e06cce7538701a
author Scott Main <smain@google.com> 1354298609 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354298609 -0800

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

* commit '0988f445a1b802f56ff7576d34e06cce7538701a':
  docs: gms and gcm javadocs