OSDN Git Service

am c5b47cff: resolved conflicts for merge of 7f9a0535 to jb-mr1-dev
authorKatie McCormick <kmccormick@google.com>
Mon, 12 Nov 2012 20:07:44 +0000 (12:07 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Nov 2012 20:07:44 +0000 (12:07 -0800)
commitc1291f700a537a18b9123ad626ae1a4ab008a9f5
tree29d4bb2b103188fe43986b68dbada3b6ae32a6d9
parent282e9fc62e571aba741ddc9523d6dfe2eca313b6
parentc5b47cff8891429f4f5cf9d6026cc2f8cfe8fcc5
am c5b47cff: resolved conflicts for merge of 7f9a0535 to jb-mr1-dev

* commit 'c5b47cff8891429f4f5cf9d6026cc2f8cfe8fcc5':
  Doc change: GCM category & dry_run params