| commit | c1291f700a537a18b9123ad626ae1a4ab008a9f5 | [log] [tgz] |
|---|---|---|
| author | Katie McCormick <kmccormick@google.com> | Mon Nov 12 12:07:44 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 12 12:07:44 2012 -0800 |
| tree | 29d4bb2b103188fe43986b68dbada3b6ae32a6d9 | |
| parent | 282e9fc62e571aba741ddc9523d6dfe2eca313b6 [diff] | |
| parent | c5b47cff8891429f4f5cf9d6026cc2f8cfe8fcc5 [diff] |
am c5b47cff: resolved conflicts for merge of 7f9a0535 to jb-mr1-dev * commit 'c5b47cff8891429f4f5cf9d6026cc2f8cfe8fcc5': Doc change: GCM category & dry_run params