tree 1dbcfaeb4f36018117863bd2dfcae7564234ac3d
parent 0a75ed0805dd7f97ff058623eb8e4f4b258c44ab
parent 05ab277c21731ab11333c56d7d2266b9b1c4d46d
author Katie McCormick <kmccormick@google.com> 1349910581 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349910581 -0700

am 05ab277c: am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev

* commit '05ab277c21731ab11333c56d7d2266b9b1c4d46d':
  Doc changes: misc GCM updates.