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

43309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
d2acfd6d04 am a58f58da: Merge "Doc change: fixing renderscript samples" into honeycomb 
* commit 'a58f58daf94caa7e50c04707a67ba1a9dacb0a9c':
  Doc change: fixing renderscript samples
 2011-02-17 20:21:35 -08:00
Scott Main
aa680857e6 am 0ddd2d1e: DO NOT MERGE Delete unused/broken samples and tests from the renderscript libs, so we can publish the entire contents of libs/rs/java/ for samples in HC 
* commit '0ddd2d1ea7cda544efc4d25601e1cdc0236e44d8':
  DO NOT MERGE Delete unused/broken samples and tests from the renderscript libs, so we can publish the entire contents of libs/rs/java/ for samples in HC
 2011-02-17 20:21:24 -08:00
Robert Ly
a58f58daf9 Merge "Doc change: fixing renderscript samples" into honeycomb 2011-02-17 18:53:36 -08:00
Robert Ly
6518f486a5 Doc change: fixing renderscript samples 
Change-Id: Ie5d17df121ec4bc5fd46448c1670d306322b92d8
 2011-02-17 18:44:31 -08:00
Scott Main
0ddd2d1ea7 DO NOT MERGE 
Delete unused/broken samples and tests from the renderscript libs,
so we can publish the entire contents of libs/rs/java/ for samples in HC

Change-Id: I0428074e995d7ee282520f54a9a3c81e32bff027
 2011-02-17 16:09:25 -08:00
Joe Malin
831a089272 am e766fcd5: DOC CHANGE: Bug 3396898 add attribute uses-library 
* commit 'e766fcd5e967c2400a1fe90a4a01e4f0a12dbd1d':
  DOC CHANGE: Bug 3396898 add attribute uses-library
 2011-02-17 13:18:30 -08:00
Joe Malin
e766fcd5e9 DOC CHANGE: Bug 3396898 add attribute uses-library 
Change-Id: I21810676050abed04c0c69b61c05d8d7228f434d
 2011-02-17 13:08:11 -08:00
Andreas Huber
09b18c2f1d am 79a97489: (-s ours) am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests. 
* commit '79a97489494deb8bdae85696f612ec7acda54240':
  DO NOT MERGE: Respond to RTSP server->client requests.
 2011-02-16 14:28:01 -08:00
Andreas Huber
79a9748949 am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests. 
* commit 'dbe09da6ac4d1e9e78e5c8f33fbc6d32822ba7ed':
  DO NOT MERGE: Respond to RTSP server->client requests.
 2011-02-16 14:24:53 -08:00
Andreas Huber
dbe09da6ac DO NOT MERGE: Respond to RTSP server->client requests. 
Even if it's just to tell them that we don't support any (this is optional).

Change-Id: Iee50b4020f28a47dfbe5d56f1732fe044b3b3655
related-to-bug: 3353752
 2011-02-16 13:37:19 -08:00
Scott Main
869f1f3e90 am 0643d7c4: docs: add new tag for tasks doc 
* commit '0643d7c442f975efa35c9e3729d74555627a32b5':
  docs: add new tag for tasks doc
 2011-02-16 12:41:53 -08:00
Scott Main
0643d7c442 docs: add new tag for tasks doc 
Change-Id: I60248fb9ec1d98e89b526391c453d1bde9226cb0
 2011-02-16 12:38:59 -08:00
Andy Stadler
04ddff6905 am b1835085: Merge "@hide DPM global proxy settings" into honeycomb 
* commit 'b18350851633b1d3717f2484d27b76aa64788ce1':
  @hide DPM global proxy settings
 2011-02-16 12:20:36 -08:00
Andy Stadler
b183508516 Merge "@hide DPM global proxy settings" into honeycomb 2011-02-16 12:18:39 -08:00
Scott Main
153cebee24 resolved conflicts for merge of f722cecd to honeycomb-plus-aosp 
Change-Id: Iaaa3a3a1231ea0e0b7ad7442cdf664418472f27f
 2011-02-16 12:08:36 -08:00
Scott Main
f722cecd18 Merge "docs: update homepage for 3.0 announcement" into honeycomb 2011-02-16 11:58:40 -08:00
Robert Greenwalt
271397cfb2 am de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread 
* commit 'de27b519588ed46c0ba601a489c01d26ec31757d':
  DO NOT MERGE - backport of l92a02b31 from master
 2011-02-16 10:55:54 -08:00
Andy Stadler
d26727273d @hide DPM global proxy settings 
They don't work as advertised, so remove from SDK.

Bug: 3460938

Change-Id: I87f80ebf38b228a4085630f1c2526c1d86b93dd7
 2011-02-16 10:53:33 -08:00
Robert Greenwalt
de27b51958 am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread 
* commit '3259d8853760a72b811757e1711119d041962a1c':
  DO NOT MERGE - backport of l92a02b31 from master
 2011-02-16 10:51:04 -08:00
Robert Greenwalt
3259d88537 Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread 2011-02-16 10:44:26 -08:00
Eric Fischer
aebe3dfe61 am 874ae43c: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '874ae43ce1c7fc1fe6c1423b581757fe14edce6e':
  Import revised translations.  DO NOT MERGE
 2011-02-16 10:38:11 -08:00
Eric Fischer
874ae43ce1 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-16 10:33:18 -08:00
Alon Albert
2d314d1282 am b79db4cd: (-s ours) am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 
* commit 'b79db4cd5ccbe17e837c8943abb658bbf0dd0854':
  DO NOT MERGE - Clear backoffs on reconnect
 2011-02-16 10:26:53 -08:00
Alon Albert
b79db4cd5c am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 
* commit 'be5f82ab0ddacea3846cfa5aa846d1c97def0318':
  DO NOT MERGE - Clear backoffs on reconnect
 2011-02-16 10:24:15 -08:00
Scott Main
415ef50d90 am 796ce77a: docs: add breadcrumbs to articles and tutorials 
* commit '796ce77abf3d1d006576490c286e72ebf0736280':
  docs: add breadcrumbs to articles and tutorials
 2011-02-16 10:23:05 -08:00
Alon Albert
be5f82ab0d Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 2011-02-16 10:20:13 -08:00
Eric Fischer
abe92da72f Import revised translations. DO NOT MERGE 
Change-Id: Id7d999bfc9d422292aa81d5a8c579840e9cc1438
 2011-02-16 10:18:37 -08:00
Alon Albert
c441e4e355 DO NOT MERGE - Clear backoffs on reconnect 
Slightly modified backport from HC

Bug: 3460736
Change-Id: I155dfd34bb7abb76a10b5b58fe9a32af2449d4f1
 2011-02-16 10:16:33 -08:00
Scott Main
796ce77abf docs: add breadcrumbs to articles and tutorials 
Change-Id: If49368853e95d39bbe6b42c6fc3820a8a7319048
 2011-02-16 10:04:45 -08:00
daniel_tomas
54f9be2a26 am 99e267eb: am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation 
* commit '99e267ebcf8f950cbdcf8438cc7383e1fc6a56c2':
  New API added in NfcAdapter to enable/disable SE card emulation
 2011-02-16 09:43:08 -08:00
daniel_tomas
99e267ebcf am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation 
* commit '7bcd2c62ebfad640e8082c1dc700c9d8c57aba81':
  New API added in NfcAdapter to enable/disable SE card emulation
 2011-02-16 09:41:00 -08:00
daniel_tomas
7bcd2c62eb New API added in NfcAdapter to enable/disable SE card emulation 
Change-Id: Ia0c123873ba9265b45e847d1a30c1300de3c1346
 2011-02-16 09:27:25 -08:00
Nick Pelly
d8d51fed86 am 8c8e9d9a: am 1df862a4: Minor doc update. 
* commit '8c8e9d9a7f1bddbc995a5c088f19a0a3be1f6a5b':
  Minor doc update.
 2011-02-16 09:25:09 -08:00
Nick Pelly
8c8e9d9a7f am 1df862a4: Minor doc update. 
* commit '1df862a4656bb0d7a3329311b1e243fc6db32448':
  Minor doc update.
 2011-02-16 09:23:08 -08:00
Scott Main
9fb2b13600 am f79bbc30: Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb 
* commit 'f79bbc305bdb0c8aa46dd7e621e229b8fd447ab9':
  docs: edit doc titles to match side nav and add breadcrumb links
 2011-02-16 09:21:06 -08:00
Nick Pelly
1df862a465 Minor doc update. 
Change-Id: I1d29adfccbdc196a145a2c2a044d63b00e5f788b
 2011-02-16 09:18:34 -08:00
Andreas Huber
0bbf966757 am 16d94f58: (-s ours) am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread 
* commit '16d94f580a50dafbe4dda3e9fe2ef47897ac1fe5':
  DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
 2011-02-16 09:10:19 -08:00
Scott Main
f79bbc305b Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb 2011-02-16 09:06:43 -08:00
Andreas Huber
16d94f580a am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread 
* commit '8db7a7bfadc7bdfa30f60bb06063f91b19234096':
  DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
 2011-02-16 09:02:08 -08:00
Andreas Huber
8db7a7bfad Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread 2011-02-16 08:50:37 -08:00
Robert Ly
e131ccb615 am c3ebf27a: am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread 
* commit 'c3ebf27a511934d7529b2fbde223169e83c74561':
  Adding package summary for nfc.tech package
 2011-02-15 22:58:51 -08:00
Robert Ly
c3ebf27a51 am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread 
* commit '4bebbe5fea1b6d7f5deff6d41d7633308607c08b':
  Adding package summary for nfc.tech package
 2011-02-15 22:54:52 -08:00
Scott Main
a925a3ca1f am 9cf2fa02: docs: add breadcrumbs to developing docs 
* commit '9cf2fa023bb55979853995a34a9fa9996a2212f0':
  docs: add breadcrumbs to developing docs
 2011-02-15 20:08:30 -08:00
Scott Main
c35d0ee105 am a766a8be: docs: add breadcrumbs to testing docs 
* commit 'a766a8bee24b46fdeea2cc891e6ce202d906245f':
  docs: add breadcrumbs to testing docs
 2011-02-15 20:08:26 -08:00
Scott Main
f0b4f10079 am f2d52938: Merge "docs: revise loader doc title" into honeycomb 
* commit 'f2d5293844a3c782ccd415d327007ec5e7681a26':
  docs: revise loader doc title
 2011-02-15 20:08:21 -08:00
Robert Ly
8700547f55 am e250cbb8: Merge "doc change: add rel note links to external tools site" into honeycomb 
* commit 'e250cbb8d5ea787c318bba384fd9cb46b446ea3d':
  doc change: add rel note links to external tools site
 2011-02-15 20:08:17 -08:00
Scott Main
a64507eed2 am c918e4a8: docs: add parent links to graphics docs 
* commit 'c918e4a86d42d89cb893b0150358cfd01ef7d532':
  docs: add parent links to graphics docs
 2011-02-15 20:08:12 -08:00
Scott Main
0ab1b326c7 am 13033ea5: docs: fix misc broken links 
* commit '13033ea52714d48d754c6bc8fccb18514c645a47':
  docs: fix misc broken links
 2011-02-15 20:08:07 -08:00
Scott Main
9cf2fa023b docs: add breadcrumbs to developing docs 
Change-Id: Id63b53a77daff2fa45424dc6607a467dc55a10e3
 2011-02-15 18:26:07 -08:00
Scott Main
a766a8bee2 docs: add breadcrumbs to testing docs 
Change-Id: Ib2b3ef1871fba52b8f34513e9279acb98d26fb6c
 2011-02-15 18:02:55 -08:00