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
Dirk Dougherty
156a2fc65a am 5fce0c1f: am e91b0533: am ed0c6fe6: am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights. 
* commit '5fce0c1fe3352ae7c69dc67be1ff84425e11455a':
  Doc change: Edits for RTL in highlights.
 2013-02-15 15:12:37 -08:00
Dirk Dougherty
5fce0c1fe3 am e91b0533: am ed0c6fe6: am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights. 
* commit 'e91b053369638f81e725a47a7491853b06aca5ae':
  Doc change: Edits for RTL in highlights.
 2013-02-15 15:11:25 -08:00
Dirk Dougherty
34434badf6 Doc change: Edits for RTL in highlights. 
Change-Id: I4a01bbcaa1470dce571295a9e5e035a395c28c1a
 2013-02-15 15:00:43 -08:00
Dirk Dougherty
dfb306b2bc am f16de3f3: am 0f4a378d: am da9ac596: am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch. 
# Via Android Git Automerger (4) and Dirk Dougherty (1)
* commit 'f16de3f3f622a04d48cd595c76165ac60a3efcfa':
  Doc change: add notice for iab v3 subscriptions launch.
 2013-02-14 12:11:30 -08:00
Dirk Dougherty
f16de3f3f6 am 0f4a378d: am da9ac596: am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch. 
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '0f4a378dc7da59a4fe45c111c09f52696dbb6476':
  Doc change: add notice for iab v3 subscriptions launch.
 2013-02-14 12:09:16 -08:00
Dirk Dougherty
f857c51d77 Doc change: add notice for iab v3 subscriptions launch. 
Change-Id: I3b1365cee219ab7fb8ac27cf333609986a947b3c
 2013-02-14 11:47:36 -08:00
quddusc
66a4d9cd33 am 6b4d73c9: am cdcc2e58: am 68785da7: am 62bd2319: am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '6b4d73c985996cf3fd1333edc073b5260c9d897e':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:19:31 -08:00
quddusc
6b4d73c985 am cdcc2e58: am 68785da7: am 62bd2319: am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'cdcc2e58e914793ff2ee475e5a4c7fd91a3d526b':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:17:07 -08:00
quddusc
38b6d7a15c Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 2013-02-14 01:09:27 +00:00
quddusc
8dcc99dd82 docs: Updated In-app Billing docs to support subscriptions for V3. 
Change-Id: If56d563249c6836245e9d3dc2d0f7d709de0bd29
 2013-02-13 16:45:41 -08:00
Joe Fernandez
4f76308544 am 9b0aa6c9: am 35390a79: am 7421aeab: am 6978d04b: am 9d95873d: Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '9b0aa6c906b22a91440ef5b980f6294c3dd42348':
  docs: SDK r21.1 - fix download links, Issue 8193979
 2013-02-13 15:36:05 -08:00
Joe Fernandez
9b0aa6c906 am 35390a79: am 7421aeab: am 6978d04b: am 9d95873d: Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '35390a7943b1a2826a95d6a2fe309089e04dd988':
  docs: SDK r21.1 - fix download links, Issue 8193979
 2013-02-13 15:33:39 -08:00
Joe Fernandez
9d95873de1 Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev 2013-02-13 23:24:10 +00:00
Scott Main
27b2b04f3c am f796c279: am e526eedb: am 1f6dbc0d: am c6608215: am d51a894a: docs: fix tools sidenav for offline docs 
# Via Android Git Automerger (4) and Scott Main (1)
* commit 'f796c2793388184e2642afd8e244762d48d54761':
  docs: fix tools sidenav for offline docs
 2013-02-13 15:19:17 -08:00
Scott Main
f796c27933 am e526eedb: am 1f6dbc0d: am c6608215: am d51a894a: docs: fix tools sidenav for offline docs 
# Via Android Git Automerger (3) and Scott Main (1)
* commit 'e526eedb8e0145f96991219abd9022ef52f4b976':
  docs: fix tools sidenav for offline docs
 2013-02-13 15:17:02 -08:00
Scott Main
d51a894a50 docs: fix tools sidenav for offline docs 
Change-Id: If15ec25f395d9e18f35085488b75be8f84a6d42f
 2013-02-13 15:06:41 -08:00
Joe Fernandez
b80012e35c docs: SDK r21.1 - fix download links, Issue 8193979 
Change-Id: Iabbbb030d50390021feab478812140158cdfd104
 2013-02-13 14:51:59 -08:00
Scott Main
ed0ea76cf4 am 1214e975: am 3baf1b6f: am 60d8836e: am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev 
# Via Android Git Automerger (4) and others
* commit '1214e975d65dc5604ac95ed3ce7565333fa3e364':
  docs: add info about secure adb
 2013-02-13 10:12:33 -08:00
Scott Main
1214e975d6 am 3baf1b6f: am 60d8836e: am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '3baf1b6f44c8f9f851e165f1b818a475b4b09fed':
  docs: add info about secure adb
 2013-02-13 10:10:08 -08:00
Scott Main
dd8b58457c Merge "docs: add info about secure adb" into jb-mr1-dev 2013-02-13 18:01:48 +00:00
Joe Fernandez
bbe99b353d am 4c28487a: 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 (4) and others
* commit '4c28487acd5f0f52d212190925d424d898fbb672':
  docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
 2013-02-13 09:47:57 -08:00
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