Robert Ly 0f9ea26dcc resolved conflicts for merge of 60e7f541 to lmp-dev ...

Conflicts:
	docs/html/google/play/billing/gp-purchase-status-api.jd

Change-Id: I23f4c1a366b894a3cf5f70e26b32cd88bc66784c

2014-07-30 14:09:25 -07:00

..

auth

add toggle for IDE instructions, revise some titles and other cleanup to Google API setup

2014-06-16 20:12:30 -07:00

backup

update url for backup service key

2013-07-09 10:49:20 -07:00

gcm

am 1f4e5686: am 289d3c25: am fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs

2014-07-16 21:44:50 +00:00

gcs

Doc update: GCM changes for I/O.

2014-06-23 22:40:16 +00:00

play

resolved conflicts for merge of 60e7f541 to lmp-dev

2014-07-30 14:09:25 -07:00

play-services

am 78ad92b4: am 4ff57a9a: am fa3d1b2a: Doc change: add notice for admob sdk upgrade.

2014-07-30 00:55:51 +00:00

google_toc.cs

docs: Revised page to include info about new Publisher API.

2014-07-29 14:00:03 -07:00

index.jd

Doc update: GCM changes for I/O.

2014-06-23 22:40:16 +00:00