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

4537 Commits

Author SHA1 Message Date
Joe Fernandez
4c28487acd am 45df16aa: am 6e372639: am 30890f28: am c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '45df16aa73c6665f55c86f4a9998e6b383b751ca':
  docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
 2013-02-13 09:45:59 -08:00
Joe Fernandez
c5cb262cc6 Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev 2013-02-13 17:35:22 +00:00
Joe Fernandez
798da53fa8 docs: Keystore/Cert warning for Signing Apps, Issue: 8180111 
Change-Id: Iab2a06fc27922aafbf10b821550098c040e2a4b2
 2013-02-13 09:26:57 -08:00
Joe Fernandez
502a15ffe8 am c698a855: am d1c9d6e8: am 3b8381e1: am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit 'c698a855d27520bac00677f78136b48e617ba333':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:23:26 -08:00
Joe Fernandez
c698a855d2 am d1c9d6e8: am 3b8381e1: am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'd1c9d6e84969ee36f8a3b74515bae715727866a1':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:21:08 -08:00
Joe Fernandez
0480d5d88c Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 2013-02-13 15:10:16 +00:00
Scott Main
7d9cf2b742 am 8d21b881: am 6d32f4e8: am 64aa66d1: am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android Git Automerger (4) and others
* commit '8d21b8811cddd716411390f48f918c80b286e412':
  lists.js files for gms and gcm
 2013-02-12 18:34:50 -08:00
Scott Main
8d21b8811c am 6d32f4e8: am 64aa66d1: am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android Git Automerger (3) and others
* commit '6d32f4e86e0fa67561c26582b9a25581744212f1':
  lists.js files for gms and gcm
 2013-02-12 18:32:33 -08:00
Scott Main
4cb43d977b Merge "lists.js files for gms and gcm" into jb-mr1-dev 2013-02-13 02:24:57 +00:00
Robert Ly
373264b776 lists.js files for gms and gcm 
Change-Id: I786adfc966986a8e71dc2164740f2a00d60c0159
 2013-02-12 18:15:04 -08:00
Scott Main
03c54e77d4 docs: add info about secure adb 
Change-Id: I6edf5bf20bce328c1e4cb2ec33f01a1439e2dbfa
 2013-02-12 14:47:17 -08:00
Scott Main
ae16a9b2ca am 4cd50a12: am b8656b3c: am 42ac0372: am 72091355: am bfec2a01: docs: nudge dashboard chart to the right to avoid overlap 
# Via Android Git Automerger (4) and Scott Main (1)
* commit '4cd50a1212ca0e94569eb04ac1a7f25967c7585c':
  docs: nudge dashboard chart to the right to avoid overlap
 2013-02-11 18:15:10 -08:00
Dirk Dougherty
9a79eccab5 am ef1d1793: am c0614c44: am b6efefb4: am 337d3e32: am 7d849491: Doc change: fix typos. 
# Via Android Git Automerger (4) and Dirk Dougherty (1)
* commit 'ef1d17938e9ae3cd02c4b72b331d3892f369138a':
  Doc change: fix typos.
 2013-02-11 17:34:23 -08:00
Scott Main
4cd50a1212 am b8656b3c: am 42ac0372: am 72091355: am bfec2a01: docs: nudge dashboard chart to the right to avoid overlap 
# Via Android Git Automerger (3) and Scott Main (1)
* commit 'b8656b3c7af99c8951459661fa5352adde5d2645':
  docs: nudge dashboard chart to the right to avoid overlap
 2013-02-11 16:59:42 -08:00
Scott Main
bfec2a0189 docs: nudge dashboard chart to the right to avoid overlap 
Change-Id: I852004b6dbd7ca8343a20f05da1166cff2d2898a
 2013-02-11 14:24:03 -08:00
Dirk Dougherty
ef1d17938e am c0614c44: am b6efefb4: am 337d3e32: am 7d849491: Doc change: fix typos. 
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit 'c0614c4471363e983610e885bf63f101be4ae21c':
  Doc change: fix typos.
 2013-02-11 11:32:06 -08:00
Dirk Dougherty
7d84949132 Doc change: fix typos. 
Change-Id: I58c8841c9bf23bc75e1b25d63af917ff56087fdc
 2013-02-11 11:18:59 -08:00
Joe Fernandez
46e31ae425 docs: Android SDK 21.1.0 Release Notes 
Change-Id: I1e97eb5a7e3b4a1c63474f7b85cb22dd343ceb4b
 2013-02-08 14:28:02 -08:00
Dirk Dougherty
6c971bfac3 am b555029e: am 2e65e20c: am 9b8b4ae5: am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit 'b555029e411498b86efad38a1948e4cfb4f43dd1':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:43:07 -08:00
Dirk Dougherty
b555029e41 am 2e65e20c: am 9b8b4ae5: am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '2e65e20c761f0fdee98eeefe9a8ee13c95a8b1ff':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:21:03 -08:00
Dirk Dougherty
34c880415b Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning. 
Change-Id: I3003fa163f7c9e10925d96f8d89005b42baed315
 2013-02-07 17:32:35 -08:00
Katie McCormick
aff494005b am 1309c9e2: am 93ebe284: am 80a01a7f: am ef4196d0: am 89fafaea: Doc update: clean up 
# Via Android Git Automerger (4) and Katie McCormick (1)
* commit '1309c9e2afe79ccd73cbf76f52477ffba92d10bd':
  Doc update: clean up
 2013-02-07 15:59:35 -08:00
Katie McCormick
1309c9e2af am 93ebe284: am 80a01a7f: am ef4196d0: am 89fafaea: Doc update: clean up 
# Via Android Git Automerger (3) and Katie McCormick (1)
* commit '93ebe2845c7f2d7afea1b679020446adcd0047ee':
  Doc update: clean up
 2013-02-07 15:57:21 -08:00
Katie McCormick
89fafaeae7 Doc update: clean up 
Change-Id: Idd11b36d54e01671d45764dd6ed327621a3fa682
 2013-02-07 14:23:14 -08:00
Scott Main
e68c1ce1d4 am 11f1c5b8: am b3a57191: am 0a00de11: am 805d2e2d: am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '11f1c5b89a98cb6794f2b1f158b8c22e38af975f':
  docs: fix renderscript links that currently require redirect
 2013-02-06 12:31:26 -08:00
Scott Main
11f1c5b89a am b3a57191: am 0a00de11: am 805d2e2d: am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'b3a57191e62e0c394ba4a3448770853a1fb7ac3b':
  docs: fix renderscript links that currently require redirect
 2013-02-06 12:26:46 -08:00
Scott Main
00f490844d Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev 2013-02-06 20:14:49 +00:00
Robert Ly
b59967b655 am c92199be: am 33fb8f63: am dfa8d028: am 5e9be5bc: am d6e0c147: Merge "docs: update auth doc to mention multiple scopes bug 7644251" into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit 'c92199be8416493739e3fc02666227092a6077a8':
  docs: update auth doc to mention multiple scopes bug 7644251
 2013-02-05 15:29:18 -08:00
Robert Ly
c92199be84 am 33fb8f63: am dfa8d028: am 5e9be5bc: am d6e0c147: Merge "docs: update auth doc to mention multiple scopes bug 7644251" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '33fb8f6309c553c809717694a84fe6564b19604f':
  docs: update auth doc to mention multiple scopes bug 7644251
 2013-02-05 15:26:29 -08:00
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