tree 7af59f96879bbdbd744ff564e36417cb91f7cdc5
parent aefd73d2b9f17a06f05346f302db1e393a7ece19
parent d21b9a9e2192e1a1803c2a19290e6badc7f69caf
author Katie McCormick <kmccormick@google.com> 1347554517 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347554517 -0700

am d21b9a9e: am 2f140f96: Merge "Doc change: GCM changes" into jb-dev

* commit 'd21b9a9e2192e1a1803c2a19290e6badc7f69caf':
  Doc change: GCM changes