tree 7de33cbc8758b146c4e35acd8453cf8f7d5475f0
parent c9506415d533c61a9607c5b61a1993747bafb406
parent ec4ec27ea6062ed460e662be2239ce169ff2d134
author Katie McCormick <kmccormick@google.com> 1343862815 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1343862816 -0700

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