tree 6f246ce04c00df7c1e54b8ee515077e927628158
parent 613d0b12532c8f9a6061c6e118981bb91e1b6107
author Katie McCormick <kmccormick@google.com> 1343167528 -0700
committer Katie McCormick <kmccormick@google.com> 1343858122 -0700

cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9

Conflicts:

	docs/html/guide/google/gcm/gcm.jd

Change-Id: I9bd42a8a8842e26797ec4a6e7e45962b1560dc6a