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

7699 Commits

Author SHA1 Message Date
Andrew Flynn
4f1f7ba3a8 am c08203c2: am 4881578e: am ea12f0fd: Fix some sync adapter docs typos. 
* commit 'c08203c22c8407d9a9777eb6f436bfb79edb1f74':
  Fix some sync adapter docs typos.
 2014-08-04 21:26:44 +00:00
Andrew Flynn
c08203c22c am 4881578e: am ea12f0fd: Fix some sync adapter docs typos. 
* commit '4881578e6ccd8b51606750e3fd4e20b2204287c7':
  Fix some sync adapter docs typos.
 2014-08-01 18:33:48 +00:00
Andrew Flynn
4881578e6c am ea12f0fd: Fix some sync adapter docs typos. 
* commit 'ea12f0fd7ed236fa38f73cfff5be5fa36f016690':
  Fix some sync adapter docs typos.
 2014-08-01 18:29:27 +00:00
Andrew Flynn
ea12f0fd7e Fix some sync adapter docs typos. 
Change-Id: Icb108bcfd7835049ff7d50660d1f8084ebc3c8e9
 2014-08-01 18:25:04 +00:00
Joe Fernandez
441e7aa234 am eb4bc851: am 69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs 
* commit 'eb4bc851aade1090c0a4e1f1e6f7ecd136b4a47a':
  docs: Adding TIF one-pager to TV docs in L-Preview
 2014-07-31 18:40:05 +00:00
Joe Fernandez
eb4bc851aa am 69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs 
* commit '69ed58aced0e884d7758d84067134b04fbcee9c0':
  docs: Adding TIF one-pager to TV docs in L-Preview
 2014-07-31 18:35:02 +00:00
Joe Fernandez
a3e521540b am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 
* commit 'ecf76d1cfd2846412270e6361ec8ba4cfccf8bec':
  docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
 2014-07-30 18:14:04 +00:00
Joe Fernandez
ecf76d1cfd am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 
* commit 'b83127f0cf35a2d95684293818ca25171f6643e1':
  docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
 2014-07-30 18:09:27 +00:00
Andrew Solovay
60e7f54187 am d46bc784: am 81364215: Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs 
* commit 'd46bc7845c221b84f9b4e570b95f407c7fc6d0e7':
  docs: Revised page to include info about new Publisher API.
 2014-07-30 17:37:06 +00:00
Andrew Solovay
d46bc7845c am 81364215: Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs 
* commit '813642158979aca52b9d3913e52dda877d74a992':
  docs: Revised page to include info about new Publisher API.
 2014-07-30 17:34:20 +00:00
Ricardo Cervera
9ae4c6f874 am b6bfa9e4: am a7898781: Merge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular-docs 
* commit 'b6bfa9e45a953b83289ee57da661746deae7a63f':
  docs: Added system requirements for Studio. Bug: 16566355
 2014-07-30 16:49:57 +00:00
Ricardo Cervera
b6bfa9e45a am a7898781: Merge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular-docs 
* commit 'a7898781d6182b5c73a0a3899b71162f92582f66':
  docs: Added system requirements for Studio. Bug: 16566355
 2014-07-30 16:46:07 +00:00
Joe Fernandez
b83127f0cf Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 2014-07-30 16:17:51 +00:00
Joe Fernandez
0d568c98c1 docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ 
Change-Id: Ifa8831e1594470ecf65761efea472de79aaf5ece
 2014-07-30 10:10:19 -07:00
Ricardo Cervera
a7898781d6 Merge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular-docs 2014-07-29 22:44:51 +00:00
Andrew Solovay
8136421589 Merge "docs: Revised page to include info about new Publisher API." into klp-modular-docs 2014-07-29 21:36:00 +00:00
Dirk Dougherty
78ad92b48f am 4ff57a9a: am fa3d1b2a: Doc change: add notice for admob sdk upgrade. 
* commit '4ff57a9aee76bdfe6808ac9c64f2e90bc14a25ae':
  Doc change: add notice for admob sdk upgrade.
 2014-07-29 21:07:53 +00:00
Dirk Dougherty
4ff57a9aee am fa3d1b2a: Doc change: add notice for admob sdk upgrade. 
* commit 'fa3d1b2a27448b82ec1aa6f75c95ed17c4f46748':
  Doc change: add notice for admob sdk upgrade.
 2014-07-29 21:03:25 +00:00
Andrew Solovay
d28470e87a docs: Revised page to include info about new Publisher API. 
Also moved the blurb to the "Google Play Distribution" cover page, and
adjusted the TOC accordingly. Per DDoughterty@ 's request, moved the
"Purchase Verification Strategies" section to billing_subscriptions.jd

Page is staged to:

http://asolovay.mtv:9543/google/play/billing/gp-purchase-status-api.html
http://asolovay.mtv:9543/google/play/billing/billing_subscriptions.html#strategies

Change-Id: I884e2f3f25c76fcb055e663058d1a4f4642fb558
 2014-07-29 14:00:03 -07:00
Dirk Dougherty
fa3d1b2a27 Doc change: add notice for admob sdk upgrade. 
Change-Id: I9281b17e4ff277ef99ae57ce0360e05f4231e7ff
 2014-07-29 20:32:17 +00:00
Ricardo Cervera
932ced3a30 docs: Added system requirements for Studio. Bug: 16566355 
Change-Id: I1d3d80ce718d64e01fd939aa177c950d56065555
 2014-07-29 13:24:34 -07:00
Robert Ly
9c53194a6f am 58967bfb: am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs 
* commit '58967bfbe824f020194872a6d0a5204b54e6043a':
  docs: fix typo bug 16623189
 2014-07-29 16:34:01 +00:00
Robert Ly
58967bfbe8 am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs 
* commit '1c977b3744dbe916edde2e256a39c30e5888ef4f':
  docs: fix typo bug 16623189
 2014-07-29 16:30:07 +00:00
Robert Ly
0029ef6759 am dadb473e: am 9613b433: Merge "docs: fix typo" into klp-modular-docs 
* commit 'dadb473e2b9dc7bf2691dea7153c6700102e6562':
  docs: fix typo
 2014-07-29 15:42:24 +00:00
Robert Ly
dadb473e2b am 9613b433: Merge "docs: fix typo" into klp-modular-docs 
* commit '9613b433f47162d008f034afbb16deac16532662':
  docs: fix typo
 2014-07-29 15:38:02 +00:00
Ricardo Cervera
7f214e6149 am 8d1aa957: am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 
* commit '8d1aa95729a44a953dd5cd434f2c7380e6d1f641':
  docs: Describe the alloc tracker in Android Studio
 2014-07-29 15:32:57 +00:00
Ricardo Cervera
8d1aa95729 am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 
* commit '652e5c7ef1f8176dc680f7c4ba782164269b03b0':
  docs: Describe the alloc tracker in Android Studio
 2014-07-29 15:29:00 +00:00
Ricardo Cervera
5ff390be1b am df881ccc: am 321e0302: docs: Fix Wear docs issues. 
* commit 'df881ccc1fe5efefa4a71cf8e5f663f9e2911151':
  docs: Fix Wear docs issues.
 2014-07-29 15:07:56 +00:00
Ricardo Cervera
df881ccc1f am 321e0302: docs: Fix Wear docs issues. 
* commit '321e030202cb74cad0dd8a4950cffe361a5072c8':
  docs: Fix Wear docs issues.
 2014-07-29 15:01:11 +00:00
Robert Ly
1c977b3744 Merge "docs: fix typo bug 16623189" into klp-modular-docs 2014-07-28 22:45:16 +00:00
Robert Ly
a66de16cde docs: fix typo bug 16623189 
Change-Id: Ia790587cf60cbf4e9f699605a5ad6a7dc5a06799
 2014-07-29 16:26:36 +00:00
Robert Ly
a37ddd97a8 docs: fix typo 
Change-Id: I4d76d625dc508e7279162d1d3ace9c32625e1358
 2014-07-29 08:33:17 -07:00
Ricardo Cervera
652e5c7ef1 Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 2014-07-28 18:28:56 +00:00
Ricardo Cervera
321e030202 docs: Fix Wear docs issues. 
Bug: 16624918
Bug: 16626217
Bug: 16626415
Bug: 16624384
Bug: 16623147

Change-Id: I774f19aded22562b891f9d2ccc35f0befb50f21c
 2014-07-28 17:52:40 +00:00
Joe Fernandez
69ed58aced Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs 2014-07-25 23:00:08 +00:00
Joe Fernandez
62aab1eaa7 docs: Adding TIF one-pager to TV docs in L-Preview 
Change-Id: I89960cb9c2c8af0ccb010b91ee42d6cffab42f95
 2014-07-31 11:04:00 -07:00
Robert Ly
9613b433f4 Merge "docs: fix typo" into klp-modular-docs 2014-07-25 21:16:23 +00:00
Ricardo Cervera
6c555824eb docs: Describe the alloc tracker in Android Studio 
Change-Id: Ic3cfc94950029104ec75ab04a9fac51ba64dd9a9
 2014-07-25 08:32:15 -07:00
Joe Fernandez
8d7c55bd10 am 441e7aa2: am eb4bc851: am 69ed58ac: Merge "docs: Adding TIF one-pager to TV docs in L-Preview" into klp-modular-docs 
* commit '441e7aa23478b8de386efc69d43f889979bc6eee':
  docs: Adding TIF one-pager to TV docs in L-Preview
 2014-07-31 18:43:21 +00:00
Joe Fernandez
9386003cb9 am a3e52154: am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 
* commit 'a3e521540b1143264033ca217d11b90ec20e6c54':
  docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
 2014-07-30 21:14:39 +00:00
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
Ricardo Cervera
7560953e5a am 9ae4c6f8: am b6bfa9e4: am a7898781: Merge "docs: Added system requirements for Studio. Bug: 16566355" into klp-modular-docs 
* commit '9ae4c6f8744b6767efbb912dbfd64ce3da13e60e':
  docs: Added system requirements for Studio. Bug: 16566355
 2014-07-30 16:53:34 +00:00
Dirk Dougherty
12b9f6ae37 am 78ad92b4: am 4ff57a9a: am fa3d1b2a: Doc change: add notice for admob sdk upgrade. 
* commit '78ad92b48f8e41a413b6a61970e278024098dbaa':
  Doc change: add notice for admob sdk upgrade.
 2014-07-30 00:55:51 +00:00
Robert Ly
7043ce4a8c am 9c53194a: am 58967bfb: am 1c977b37: Merge "docs: fix typo bug 16623189" into klp-modular-docs 
* commit '9c53194a6fccd9980d4ee3fabe4466b16d73580b':
  docs: fix typo bug 16623189
 2014-07-29 16:48:33 +00:00
Robert Ly
c7af515f91 am 0029ef67: am dadb473e: am 9613b433: Merge "docs: fix typo" into klp-modular-docs 
* commit '0029ef67598336e3a774c6cf1dfde8245136484a':
  docs: fix typo
 2014-07-29 16:48:17 +00:00
Ricardo Cervera
9ce46bc1cc am 7f214e61: am 8d1aa957: am 652e5c7e: Merge "docs: Describe the alloc tracker in Android Studio" into klp-modular-docs 
* commit '7f214e6149b38af10224cf9f8f8f4959eebd52a6':
  docs: Describe the alloc tracker in Android Studio
 2014-07-29 16:48:11 +00:00
Ricardo Cervera
6d327429bb am 5ff390be: am df881ccc: am 321e0302: docs: Fix Wear docs issues. 
* commit '5ff390be1b0b968ccf28e693b602b8e8b5f448e9':
  docs: Fix Wear docs issues.
 2014-07-29 16:48:01 +00:00
Ricardo Cervera
753d849b2a am 0f1e067a: am 472e234d: am 7af4e812: docs: Fixed RecyclerView example. Bug: 16483811 
* commit '0f1e067a28c2ef50d4db53ad19e0902b052bd014':
  docs: Fixed RecyclerView example. Bug: 16483811
 2014-07-24 16:22:40 +00:00
Scott Rowe
fc66190344 am 162493b5: am 3bb44fec: am 72c80d30: cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1 
* commit '162493b5e3fb1bbf4505c2d18ebf6c900d7875e6':
  cherrypick from klp-docs docs: b/14387628 - Testing Localized Applications, menu not found Change-Id: I5e2977e3820d79588f73f171a32b0d7c7d6307d1
 2014-07-24 16:22:15 +00:00
Ricardo Cervera
0f1e067a28 am 472e234d: am 7af4e812: docs: Fixed RecyclerView example. Bug: 16483811 
* commit '472e234d807df490124263c1e28c66e1918787c9':
  docs: Fixed RecyclerView example. Bug: 16483811
 2014-07-23 23:12:15 +00:00