drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,850 Commits 1 Branch 0 Tags
Commit Graph

7013 Commits

Author SHA1 Message Date
Joe Fernandez
d36dbe09a1 am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs 
* commit 'e961d0b521bc25caf964258e75fef3d3ea22e4ac':
  Revert "docs: Update for Android 23.0.4"
 2014-10-02 21:14:59 +00:00
Joe Fernandez
e961d0b521 Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs 2014-10-02 21:08:27 +00:00
Joe Fernandez
65ba319742 Revert "docs: Update for Android 23.0.4" 
This reverts commit f34d0e69033165b7a6e9c73b99f4ef6ac36b3896.

Change-Id: I4d521392733f1b028c72d4623d6d69a4c5910bc4
 2014-10-02 21:07:49 +00:00
Ricardo Cervera
957f45c328 am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '680092c5987e701043ff0fa0d2c5390e829412c0':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:07:53 +00:00
Ricardo Cervera
680092c598 Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 2014-10-02 18:04:42 +00:00
Ricardo Cervera
4ffffb8e8c docs: Provide direct link to Ubuntu troubleshooting. 
Change-Id: I6a9f8c3f3ef01abcfdaf95730139156ba443a4be
 2014-10-02 10:57:39 -07:00
Rich Slogar
b15cd52966 am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit 'c074c3a4074791ae1270e3177e2299f31b9bb5a1':
  docs: Update for Android 23.0.4
 2014-10-02 17:38:35 +00:00
Rich Slogar
c074c3a407 Merge "docs: Update for Android 23.0.4" into klp-modular-docs 2014-10-02 17:31:05 +00:00
Rich Slogar
f34d0e6903 docs: Update for Android 23.0.4 
Change-Id: I7025dcf9bbfd03b555f7f5059d0e35f67f836dcf
 2014-10-02 10:19:17 -07:00
kmccormick
ae3bd63bc5 am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 
* commit 'a1572ffc6b8df1f0da637fdb93b949322fcb3637':
  Doc update: Update preprod (staging) instructions.
 2014-10-01 17:08:13 +00:00
kmccormick
a1572ffc6b Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 2014-10-01 17:02:26 +00:00
Ricardo Cervera
781c988a76 am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit 'ae7b5dc49381e76c82cda928cc37a6a8b529da25':
  docs: ADT beginner text fix
 2014-10-01 02:57:29 +00:00
Ricardo Cervera
ae7b5dc493 Merge "docs: ADT beginner text fix" into klp-modular-docs 2014-10-01 02:07:15 +00:00
Ricardo Cervera
571e918345 docs: ADT beginner text fix 
Change-Id: I03cc08d5a4f12137a573c23d1ee07e048225c8f5
 2014-09-30 15:07:16 -07:00
kmccormick
76ab6c6290 Doc update: Update preprod (staging) instructions. 
Fix for:

b/17525318

Change-Id: Id93bd3e6e1fd5f203733121e3148cec8b24ab374
 2014-09-30 12:24:40 -07:00
Scott Rowe
294d534787 am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit '9d20628b4beb38470d4f7d10193ac5a7cc558d41':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-09-29 22:53:15 +00:00
Scott Rowe
9d20628b4b docs: b/16044763 Update IAB docs to give notice of v2 turndown 
Change-Id: I696c9b22707d34635ab65b392d90aa7406ab40d0
 2014-09-29 15:11:46 -07:00
Ricardo Cervera
9f48394158 am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs 
* commit '808440cd5e1052f21b937cdcb60acecefd57f23c':
  docs: Fixed path for build output.
 2014-09-29 20:43:55 +00:00
Ricardo Cervera
808440cd5e Merge "docs: Fixed path for build output." into klp-modular-docs 2014-09-29 14:56:30 +00:00
Dirk Dougherty
5913f40618 am 6373718b: Merge "Doc change: Add new index page for games stories." into klp-modular-docs 
* commit '6373718b883dd945c17987ac64925c0fdc30674d':
  Doc change: Add new index page for games stories.
 2014-09-27 05:14:05 +00:00
Dirk Dougherty
6373718b88 Merge "Doc change: Add new index page for games stories." into klp-modular-docs 2014-09-27 03:16:53 +00:00
Dirk Dougherty
eb81afbe29 Doc change: Add new index page for games stories. 
Change-Id: Icd9de0715c8a77333fd73a46f31c3ad81d0b951b
 2014-09-26 17:43:14 -07:00
Ricardo Cervera
b9c000e090 docs: Fixed path for build output. 
http://b.android.com/76374

Change-Id: I950174eba961e2bf31600671e438e2b85176a9d4
 2014-09-26 13:25:02 -07:00
Dirk Dougherty
afbe165aec Doc change: Add IAB v2 deprecation notice. 
Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1

Conflicts:
	docs/html/google/play/billing/index.jd
 2014-09-26 11:09:12 -07:00
Joe Fernandez
1968b91937 am b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs 
* commit 'b8a60dada505d79341cfa4cc2b9906d892e8298b':
  docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
 2014-09-24 15:44:50 +00:00
Joe Fernandez
b8a60dada5 Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs 2014-09-24 15:39:01 +00:00
Joe Fernandez
57024257e5 docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher 
Change-Id: Iab735d07e705f019828d649e370fe5ef5006f305
 2014-09-24 08:35:03 -07:00
Ricardo Cervera
4d0f84bb55 am 556f23aa: Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs 
* commit '556f23aa1ae01832611e5e3b4059b47e6a7a00fb':
  docs: Fixed Developer Tools image. Bug: 17609483
 2014-09-22 21:37:06 +00:00
Ricardo Cervera
556f23aa1a Merge "docs: Fixed Developer Tools image. Bug: 17609483" into klp-modular-docs 2014-09-22 21:26:35 +00:00
David Friedman
6bacce4f24 am 8dcf1c32: Fixes two typos, one in each file. 
* commit '8dcf1c32299e2c1c58c053925c572d58f2a74ee9':
  Fixes two typos, one in each file.
 2014-09-22 20:41:17 +00:00
Ricardo Cervera
4af9fa4b23 docs: Fixed Developer Tools image. Bug: 17609483 
Change-Id: I400713dfe5ca54da193dccf15dac117dc4e11ca2
 2014-09-22 19:56:48 +00:00
David Friedman
8dcf1c3229 Fixes two typos, one in each file. 
Change-Id: I5f4a9100d20f8ad50052d63dc106a030ac75b1b0
 2014-09-22 10:24:41 -07:00
Dirk Dougherty
496cfbf7a8 Doc change: Add IAB v2 deprecation notice. 
Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1

Conflicts:
	docs/html/google/play/billing/index.jd
 2014-09-17 15:56:43 -07:00
Robert Ly
9efd9f6070 am fc95c477: docs: edu changes for launch 
* commit 'fc95c477835f86d99cf8c7ce5c1dd098fa42e69c':
  docs: edu changes for launch
 2014-09-17 15:19:15 +00:00
Robert Ly
fc95c47783 docs: edu changes for launch 
Change-Id: Ia9047138bd9972e572b5dd93310339b630a2810d
 2014-09-17 15:13:09 +00:00
Andrew Solovay
6c6664c95d am a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs 
* commit 'a209406faa1f2b0f1dd7b6e3c5a468729f1c562f':
  Docs: Updated to include new Subscriptions functionality.
 2014-09-17 06:01:09 +00:00
Andrew Solovay
a209406faa Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs 2014-09-17 02:21:10 +00:00
Robert Ly
d00b110a3b am e152b793: docs: remove fire and forget language from wear docs 
* commit 'e152b793e5f56ac9d73d0b3e3e191fea6b0ba1e5':
  docs: remove fire and forget language from wear docs
 2014-09-15 19:27:18 +00:00
Robert Ly
e152b793e5 docs: remove fire and forget language from wear docs 
Change-Id: I0a8d83ba0db24f1232d4c729f298c6af04c048b3
 2014-09-15 10:46:23 -07:00
Joe Fernandez
02480cbffa am 1b12b1dc: Merge "docs: remove bad link in the quick view box for TV Recommendations #2" into klp-modular-docs 
* commit '1b12b1dc6f0203913ceb0a88dcf5ef1639fe6515':
  docs: remove bad link in the quick view box for TV Recommendations #2
 2014-09-12 23:42:04 +00:00
Joe Fernandez
1b12b1dc6f Merge "docs: remove bad link in the quick view box for TV Recommendations #2" into klp-modular-docs 2014-09-12 23:28:54 +00:00
Joe Fernandez
b813f16c47 docs: remove bad link in the quick view box for TV Recommendations #2 
Change-Id: I649d8d735bda2b0c657217bc86c1a29a2d7eddc2
 2014-09-12 16:24:01 -07:00
kmccormick
f530df1c7e am 7392152b: Doc Update: update Cloud Platform link 
* commit '7392152ba21917aff15db89988e1317819b5dd72':
  Doc Update: update Cloud Platform link
 2014-09-12 18:49:18 +00:00
kmccormick
7392152ba2 Doc Update: update Cloud Platform link 
Fix for:

b/17411644

Change-Id: I3893ed25d7b058e2635a56113af74d20284688af
 2014-09-11 18:26:15 -07:00
Ricardo Cervera
02afa7348b am a6c12f01: Merge "docs: Fixed minor bug in downloads class. Bug: 16948533" into klp-modular-docs 
* commit 'a6c12f0189c92b556fd7c3af3d8466d9b6d828c9':
  docs: Fixed minor bug in downloads class. Bug: 16948533
 2014-09-11 00:06:10 +00:00
Ricardo Cervera
d086db30d0 Merge "cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365" into klp-modular-docs 2014-09-10 23:57:47 +00:00
Ricardo Cervera
a6c12f0189 Merge "docs: Fixed minor bug in downloads class. Bug: 16948533" into klp-modular-docs 2014-09-10 23:57:16 +00:00
Andrew Solovay
88653cb63e Docs: Updated to include new Subscriptions functionality. 
Includes refund/revoke, seasonal subscriptions, etc.

Docs are staged to:

http://asolovay.mtv:9393/google/play/billing/index.html
http://asolovay.mtv:9393/google/play/billing/billing_subscriptions.html

Change-Id: Id8ad33025c2ae165d6fc5e050c4f2aef70acc0d0
 2014-09-10 11:09:24 -07:00
Robert Ly
5debe44b88 am 0743bca5: docs: add 64k method limit note 
* commit '0743bca58961582078f4e8199fe9a6fa044036eb':
  docs: add 64k method limit note
 2014-09-10 18:04:16 +00:00
Robert Ly
0743bca589 docs: add 64k method limit note 
Change-Id: I6590fc996331c1f2024276d338c4035f2cb0f18d
 2014-09-10 10:50:46 -07:00