OSDN Git Service

resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev
authorKatie McCormick <kmccormick@google.com>
Sat, 10 Aug 2013 00:55:05 +0000 (17:55 -0700)
committerKatie McCormick <kmccormick@google.com>
Sat, 10 Aug 2013 00:55:05 +0000 (17:55 -0700)
commit385bb2eb5184686c2d953fe4757522e61acb3392
tree5b6d04e1eae33b7b6d265150c38ced1c83485f9f
parent02eab434ad9faa25291e63023b7e66698ca457a8
parent45178b13407077c1993c0183f11cbf1b1f781e40
resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev

Change-Id: I3f0f4d210dd48ddbed5795278c7e2b5f07da5978
docs/html/google/gcm/notifications.jd