tree 552aa1c1ef4f0f0da15238992466ce2895396aa2
parent c221f35de3a5e76311d993a36f241e41d787ff2b
parent 510d817977af6761274e700178a854b9f9160d9c
author Katie McCormick <kmccormick@google.com> 1343863351 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343863351 -0700

am 510d8179: am a5e150c9: Merge "cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1" into jb-dev

* commit '510d817977af6761274e700178a854b9f9160d9c':
  cherrypick from master docs: Battery class C2DM -> GCM Change-Id: If5fe0034ae0bb72c321b591f84e79acbaf2e36f1