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

..

v2

docs: Removed reference to draft apps.

2014-05-30 14:38:52 -07:00

api.jd

docs: Updated In-app Billing docs to support subscriptions for V3.

2013-02-13 16:45:41 -08:00

billing_admin.jd

docs: Removed reference to draft apps.

2014-05-30 14:38:52 -07:00

billing_best_practices.jd

…

billing_integrate.jd

docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets.

2014-01-06 19:53:49 +00:00

billing_overview.jd

docs: add EU legal notice

2014-07-16 12:15:11 -07:00

billing_reference.jd

am a6eaec81: am dd50e98c: am f634d6a2: am c0050433: Merge "docs: Added details about key/signature for IAB/Licensing docs. Bugs: 8338447" into jb-mr1.1-docs

2013-04-02 10:04:19 -07:00

billing_subscriptions.jd

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

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

billing_testing.jd

docs: Removed reference to draft apps.

2014-05-30 14:38:52 -07:00

gp-purchase-status-api.jd

resolved conflicts for merge of 60e7f541 to lmp-dev

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

index.jd

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

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

versions.jd

docs: Updated In-app Billing docs to support subscriptions for V3.

2013-02-13 16:45:41 -08:00