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

4408 Commits

Author SHA1 Message Date
Robert Ly
d6e0c14717 Merge "docs: update auth doc to mention multiple scopes bug 7644251" into jb-mr1-dev 2013-02-05 23:17:36 +00:00
Scott Main
b47fa1699a docs: fix renderscript links that currently require redirect 
Change-Id: Ie12ff2c4be5ca22ac43dfe3a16868c7bef8e4ae8
 2013-02-05 14:23:13 -08:00
quddusc
da27e5a2c4 am a8ce4020: am 77c6f8ee: am a6a320ab: am 640d570d: am 1247fbd4: docs: Removed the -e runner subcommand option. Bug: 7562330 
# Via Android Git Automerger (4) and quddusc (1)
* commit 'a8ce402078b84a112d13d8ea0de3fe123e1f2a97':
  docs: Removed the -e runner subcommand option. Bug: 7562330
 2013-02-05 12:39:08 -08:00
quddusc
a8ce402078 am 77c6f8ee: am a6a320ab: am 640d570d: am 1247fbd4: docs: Removed the -e runner subcommand option. Bug: 7562330 
# Via Android Git Automerger (3) and quddusc (1)
* commit '77c6f8ee22c66c829ea91740d178ff3323e1cb67':
  docs: Removed the -e runner subcommand option. Bug: 7562330
 2013-02-05 12:36:11 -08:00
quddusc
1247fbd43f docs: Removed the -e runner subcommand option. 
Bug: 7562330

Change-Id: I5fb7ee00583a8c25745796721ded8f6cba6f09ca
 2013-02-05 11:37:46 -08:00
Robert Ly
a2cd828b74 am 9fcde2e7: am cb815699: am 00e9db5d: am b23a35a3: am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '9fcde2e7466c29b302cc15ed2d1233f93d7f0b0e':
  docs: update javadocs for gms and gcm
 2013-02-05 10:29:49 -08:00
Robert Ly
9fcde2e746 am cb815699: am 00e9db5d: am b23a35a3: am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'cb8156996a3bf5f75ea3dd7c289970bae32079ce':
  docs: update javadocs for gms and gcm
 2013-02-05 10:23:04 -08:00
Robert Ly
ba84a04a2f Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev 2013-02-05 18:12:56 +00:00
Robert Ly
f6f5cf484c docs: update javadocs for gms and gcm 
Change-Id: If5c80d3fac68a6351b652a19c199de1107ebd593
 2013-02-05 09:26:35 -08:00
Scott Main
ebbdbe6488 am d3c150e5: am e218ac96: am 1dba73f6: am 83359e82: am 5439e0c2: docs: followup update for dashboard; add platform pie 
# Via Android Git Automerger (4) and Scott Main (1)
* commit 'd3c150e5efcb884ee5791b8bc07d334caeb50144':
  docs: followup update for dashboard; add platform pie
 2013-02-04 17:20:06 -08:00
Scott Main
850c32e723 am 9045b1d1: am a6404338: am d042b849: am 641f74ae: am dde4eedf: Merge "docs: update dashboard platform data for feb" into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '9045b1d1e34fcf591f76244294d81f3ad80c8199':
  docs: update dashboard platform data for feb
 2013-02-04 17:20:01 -08:00
Dirk Dougherty
35a5108f58 am 05cc5c65: am 59abf4ae: am db3ace21: am 98ffd11c: am 26231572: Doc change: add redirects file (yaml) for use in devsite docs builds. 
# Via Android Git Automerger (4) and Dirk Dougherty (1)
* commit '05cc5c65ab044e20123f1a10b2a41cc5ed1b062a':
  Doc change: add redirects file (yaml) for use in devsite docs builds.
 2013-02-04 17:19:39 -08:00
Scott Main
d3c150e5ef am e218ac96: am 1dba73f6: am 83359e82: am 5439e0c2: docs: followup update for dashboard; add platform pie 
# Via Android Git Automerger (3) and Scott Main (1)
* commit 'e218ac96f4b3229879256926595b080cc5266172':
  docs: followup update for dashboard; add platform pie
 2013-02-04 15:58:51 -08:00
Scott Main
5439e0c2f7 docs: followup update for dashboard; add platform pie 
Change-Id: I70b8d4e0384d995761a66afc34a66bcb03e5e74e
 2013-02-04 15:42:13 -08:00
Scott Main
9045b1d1e3 am a6404338: am d042b849: am 641f74ae: am dde4eedf: Merge "docs: update dashboard platform data for feb" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'a64043382309c60c86b48ad45e752f44a5a71ca1':
  docs: update dashboard platform data for feb
 2013-02-04 15:23:50 -08:00
Scott Main
dde4eedfb1 Merge "docs: update dashboard platform data for feb" into jb-mr1-dev 2013-02-04 23:10:46 +00:00
Scott Main
d799ffc235 docs: update dashboard platform data for feb 
Change-Id: Ie248bf69bcdca4434e53ab31a82a55fd9da4825b
 2013-02-04 14:02:48 -08:00
Dirk Dougherty
05cc5c65ab am 59abf4ae: am db3ace21: am 98ffd11c: am 26231572: Doc change: add redirects file (yaml) for use in devsite docs builds. 
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '59abf4ae5772349c306ae38792ef651ea845c9c7':
  Doc change: add redirects file (yaml) for use in devsite docs builds.
 2013-02-04 13:49:14 -08:00
Dirk Dougherty
2623157244 Doc change: add redirects file (yaml) for use in devsite docs builds. 
Change-Id: I87d922bd4959c093544caf2addcb322ca7208fe8
 2013-02-04 13:39:38 -08:00
Dirk Dougherty
71e404d204 am ea635a59: am 6602ade6: am ed1c148d: am 3d57823a: am 8a72b6e0: Doc change: Remove more proto scheme from src urls (to fix mixed content warnings). 
# Via Android Git Automerger (4) and Dirk Dougherty (1)
* commit 'ea635a59100e02e298f80fa66e9d8570c78e4175':
  Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
 2013-02-04 13:18:04 -08:00
Scott Main
0edabe4fd9 am 2502b45f: am 8f0e965d: am b89123dd: am 8b62c402: am bf1d230b: Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '2502b45f652eb8a56b88d6618636903175d5b848':
  docs: delete orphaned images (the obvious ones)
 2013-02-04 13:17:58 -08:00
Scott Main
e1cc84a28d am 7936bee1: am 0031d177: am e63e6d07: am 3424794d: am e63dfe5a: docs: fix broken links 
# Via Android Git Automerger (4) and Scott Main (1)
* commit '7936bee1364ed96a1e96f4fa8af07f1ab26b6791':
  docs: fix broken links
 2013-02-04 13:17:54 -08:00
Dirk Dougherty
6526382f56 am 86f96215: am 29c40abf: am 18e9a79f: am 120f7eb5: am e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '86f962159a0cc3c5b56d7fcf8d4187eefd5f4442':
  Doc change: Remove proto scheme from src urls (fix mixed content warning).
 2013-02-04 13:17:49 -08:00
Scott Main
ec9d259619 am 23becda5: am cd655c53: am 7d47fbf3: am d2242891: am e55d5e86: docs: change "android developer console" to "developer console" 
# Via Android Git Automerger (4) and Scott Main (1)
* commit '23becda5d008bfe64a9b101e6967d96d4ece8d0e':
  docs: change "android developer console" to "developer console"
 2013-02-04 13:17:45 -08:00
Scott Main
afd3d19bc4 am 9186aaaa: am 2bbaf754: am 80235ca7: am 6c9d6373: am f216ded9: Merge "docs: clarify usage for adb am component option" into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '9186aaaa0283cf6a26f3b2bcf8e7d35087b4e71e':
  docs: clarify usage for adb am component option
 2013-02-04 13:17:41 -08:00
Dirk Dougherty
1ea5c76050 am 6a4c6f43: am d1e1e535: am a929ea12: am 01084b96: am 3b4b067b: Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '6a4c6f43ea936c487a7b2c8797d93daedf1532e6':
  Doc change: remove duplicate image directory (use /sdk/images instead).
 2013-02-04 13:17:26 -08:00
Scott Main
a6d9990fba am 91f94294: am 2357d979: am 2e5b2306: am 68d0f32c: am 48f9f83b: Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '91f942943365f74a10731503bf40a89bbb090956':
  docs: update adb tool page with am and pm reference
 2013-02-04 13:17:12 -08:00
Dirk Dougherty
db911cf409 am 23aa4774: am 904ffedb: am 36b58ea9: am d6e176c8: am 2c1669c4: Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '23aa4774b74bdd7b59a36fdf37333d33e03d7a1f':
  Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed.
 2013-02-04 13:17:03 -08:00
Adam Koch
c013451d63 am 7ffbbc27: am 01e89434: am 1826e8c3: am 3ef2c026: am 376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000) 
# Via Android Git Automerger (4) and Adam Koch (1)
* commit '7ffbbc276cfc9748a116dca3e8dac99c6b4490b4':
  Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
 2013-02-04 13:16:58 -08:00
Dirk Dougherty
5c828c748d am 9ab0f989: am 693d0b00: am fcd84aa0: am daf487fe: am df9fa4c6: Doc change: Explicitly declare pages that should use the \'sdk\' page template. This simplifies the assignment of the \'sdk\' hdf var in Doclava. 
# Via Android Git Automerger (4) and Dirk Dougherty (1)
* commit '9ab0f98920596aeb5554ccd591322ec2d1f12484':
  Doc change: Explicitly declare pages that should use the 'sdk' page template. This simplifies the assignment of the 'sdk' hdf var in Doclava.
 2013-02-04 13:16:52 -08:00
Dirk Dougherty
ea635a5910 am 6602ade6: am ed1c148d: am 3d57823a: am 8a72b6e0: Doc change: Remove more proto scheme from src urls (to fix mixed content warnings). 
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '6602ade615ce5ad206722b3c3ffac955078a9cc7':
  Doc change: Remove more proto scheme from src urls (to fix mixed content warnings).
 2013-02-04 09:07:50 -08:00
Scott Main
2502b45f65 am 8f0e965d: am b89123dd: am 8b62c402: am bf1d230b: Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '8f0e965de78dbe356fb33ce9eced6ddc3bef5132':
  docs: delete orphaned images (the obvious ones)
 2013-02-04 09:07:41 -08:00
Scott Main
7936bee136 am 0031d177: am e63e6d07: am 3424794d: am e63dfe5a: docs: fix broken links 
# Via Android Git Automerger (3) and Scott Main (1)
* commit '0031d177b6137a004930c207f57ac5ac9386c72b':
  docs: fix broken links
 2013-02-04 09:07:25 -08:00
Dirk Dougherty
86f962159a am 29c40abf: am 18e9a79f: am 120f7eb5: am e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '29c40abf9eaa6ed5af6100616cf9cf91a47bc477':
  Doc change: Remove proto scheme from src urls (fix mixed content warning).
 2013-02-04 09:07:20 -08:00
Scott Main
23becda5d0 am cd655c53: am 7d47fbf3: am d2242891: am e55d5e86: docs: change "android developer console" to "developer console" 
# Via Android Git Automerger (3) and Scott Main (1)
* commit 'cd655c53cd97b83b1d86f3c5bb38666392feea26':
  docs: change "android developer console" to "developer console"
 2013-02-04 09:07:16 -08:00
Scott Main
9186aaaa02 am 2bbaf754: am 80235ca7: am 6c9d6373: am f216ded9: Merge "docs: clarify usage for adb am component option" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '2bbaf754745a6a31fdc8e2ed5eb90d5790f198e9':
  docs: clarify usage for adb am component option
 2013-02-04 09:07:13 -08:00
Dirk Dougherty
6a4c6f43ea am d1e1e535: am a929ea12: am 01084b96: am 3b4b067b: Merge "Doc change: remove duplicate image directory (use /sdk/images instead)." into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'd1e1e5353acfd229190faaf8c7a905c4b23efde1':
  Doc change: remove duplicate image directory (use /sdk/images instead).
 2013-02-04 09:07:01 -08:00
Scott Main
91f9429433 am 2357d979: am 2e5b2306: am 68d0f32c: am 48f9f83b: Merge "docs: update adb tool page with am and pm reference" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '2357d9796a5dbbbe95c2b27eacf11f0b19d5d9c7':
  docs: update adb tool page with am and pm reference
 2013-02-04 09:06:51 -08:00
Dirk Dougherty
23aa4774b7 am 904ffedb: am 36b58ea9: am d6e176c8: am 2c1669c4: Merge "Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed." into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '904ffedb7e904246aadcc5519da2adbf112a0430':
  Doc change: Add new file location for localized docs. Files in this dir are currently only used by devsite docs builds. The html/intl/... files will eventually be removed.
 2013-02-04 09:06:45 -08:00
Adam Koch
7ffbbc276c am 01e89434: am 1826e8c3: am 3ef2c026: am 376e707f: Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000) 
# Via Android Git Automerger (3) and Adam Koch (1)
* commit '01e894340f262239254a633817d169fd54ba2268':
  Displaying Bitmaps Efficiently Training - Update sample app Update sample app zip (see http://ag/268000)
 2013-02-04 09:06:41 -08:00
Dirk Dougherty
9ab0f98920 am 693d0b00: am fcd84aa0: am daf487fe: am df9fa4c6: Doc change: Explicitly declare pages that should use the \'sdk\' page template. This simplifies the assignment of the \'sdk\' hdf var in Doclava. 
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '693d0b00006cea2645d6487418e009ec3f328402':
  Doc change: Explicitly declare pages that should use the 'sdk' page template. This simplifies the assignment of the 'sdk' hdf var in Doclava.
 2013-02-04 09:06:38 -08:00
Dirk Dougherty
8a72b6e0db Doc change: Remove more proto scheme from src urls (to fix mixed content warnings). 
Change-Id: I1c2276f5fb057a0ca20c0d1feef2bce0ab7ffab8
 2013-02-01 15:00:09 -08:00
Scott Main
bf1d230b05 Merge "docs: delete orphaned images (the obvious ones)" into jb-mr1-dev 2013-02-01 22:23:01 +00:00
Scott Main
e63dfe5a48 docs: fix broken links 
Change-Id: I7c63b1a2cfe016744fbef532354821bff024ee17
 2013-02-01 14:18:51 -08:00
Dirk Dougherty
e929e66197 Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev 2013-02-01 22:03:41 +00:00
Dirk Dougherty
b4c6c1b218 Doc change: Remove proto scheme from src urls (fix mixed content warning). 
Change-Id: I405d0f2e3df5e6e22bf9b09be27f7f7a2d93ba5a
 2013-02-01 13:35:42 -08:00
Scott Main
40c7b7a92f docs: delete orphaned images (the obvious ones) 
Change-Id: Ib6219e65a05925a13a26c415c69431bc2fbbdc68
 2013-02-01 11:57:01 -08:00
Scott Main
e55d5e864b docs: change "android developer console" to "developer console" 
Change-Id: I7071e97ed22c2971880c0f63cb10f83f887c9935
 2013-01-30 15:54:18 -08:00
Scott Main
483d785b42 docs: clarify usage for adb am component option 
Change-Id: I0b99dffc0b9d465c3a639bd1f7760561e40e2a5f
 2013-01-30 15:16:10 -08:00
Dirk Dougherty
f04207aad5 Doc change: remove duplicate image directory (use /sdk/images instead). 
Change-Id: If987d7a31d8b9dc203e9d224a59aeeab8aa5297f
 2013-01-29 14:26:02 -08:00