OSDN Git Service

am c1291f70: am c5b47cff: resolved conflicts for merge of 7f9a0535 to jb-mr1-dev
authorKatie McCormick <kmccormick@google.com>
Mon, 12 Nov 2012 20:10:05 +0000 (12:10 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Nov 2012 20:10:05 +0000 (12:10 -0800)
commit9c66227406bb9c84948a531ec3c4be3641329ddc
tree945d36ff3c19ffb717d864a85c5bdee4d92d1546
parent25c94e9ee302db6a0a94ffaf109b3eed7ac4ccb5
parentc1291f700a537a18b9123ad626ae1a4ab008a9f5
am c1291f70: am c5b47cff: resolved conflicts for merge of 7f9a0535 to jb-mr1-dev

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