OSDN Git Service

am 1dbce5f1: am 05ab277c: am fa4865f6: resolved conflicts for merge of 0b479e43 to...
authorKatie McCormick <kmccormick@google.com>
Wed, 10 Oct 2012 23:12:06 +0000 (16:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Oct 2012 23:12:06 +0000 (16:12 -0700)
commited6059a292330a1d26953a485da6e0c2ede60ba7
tree469f1d21f5985ba57b39fc49327c5ac04792a831
parent82314aeb550987adc0f604e9d3d21567219a1a32
parent1dbce5f1e55bdc61a767cd82b59a3919a4683b5e
am 1dbce5f1: am 05ab277c: am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev

* commit '1dbce5f1e55bdc61a767cd82b59a3919a4683b5e':
  Doc changes: misc GCM updates.