tree b8e92d70fe02b0bda0394a716065f900fbe7ea89
parent 3333166738ca1382307bcf61e30adba6bdec83d4
parent bcc27903fb4b9581f2b6912d767cccb2d1c2e1ba
author Katie McCormick <kmccormick@google.com> 1391884747 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391884747 +0000

am bcc27903: am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs

* commit 'bcc27903fb4b9581f2b6912d767cccb2d1c2e1ba':
  Doc update: misc GCM fixes