ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
30,729 Commits 2 Branches 0 Tags 54 MiB
fc9d6d7d6c
Commit Graph

30729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Stadler
b81ccee06f Merge "@hide DPM global proxy settings" into honeycomb 2011-02-16 12:18:39 -08:00
Scott Main
d64d21ce27 am 153cebee: resolved conflicts for merge of f722cecd to honeycomb-plus-aosp 
* commit '153cebee2432a931773130bffa20e72a982c0107':
  docs: update homepage for 3.0 announcement
 2011-02-16 12:11:11 -08:00
Scott Main
82170c4286 resolved conflicts for merge of f722cecd to honeycomb-plus-aosp 
Change-Id: Iaaa3a3a1231ea0e0b7ad7442cdf664418472f27f
 2011-02-16 12:08:36 -08:00
Scott Main
ea66537c17 Merge "docs: update homepage for 3.0 announcement" into honeycomb 2011-02-16 11:58:40 -08:00
Daniel Sandler
28a5f4b9d3 Merge "Fix NPE." 2011-02-16 11:32:39 -08:00
Robert Greenwalt
55b74ef6cd am 271397cf: (-s ours) am de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread 
* commit '271397cfb2b79d1346568209b37b1f57707f924a':
  DO NOT MERGE - backport of l92a02b31 from master
 2011-02-16 10:58:34 -08:00
Kenny Root
af1cf07134 Clean up use of HAVE_ANDROID_OS 
HAVE_ANDROID_OS was defined as "1" for targets, but never defined as "0"
for non-targets. Changing them to #ifdef should be safe and matches
all the other uses of HAVE_ANDROID_OS throughout the system.

Change-Id: I82257325a8ae5e4e4371ddfc4dbf51cea8ea0abb
 2011-02-16 10:56:32 -08:00
Robert Greenwalt
944d50d30d 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
Robert Greenwalt
c6ef3a4c15 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
Fabrice Di Meglio
8d52b886b3 Merge "Code cleaning" 2011-02-16 10:48:12 -08:00
Robert Greenwalt
b9ce99c940 Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread 2011-02-16 10:44:26 -08:00
Eric Fischer
7da7442cf2 am aebe3dfe: (-s ours) am 874ae43c: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'aebe3dfe61ba889962174cf9e24783770af31e02':
  Import revised translations.  DO NOT MERGE
 2011-02-16 10:41:59 -08:00
Eric Fischer
f6969a2d3c 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
fd71a95a6e Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-16 10:33:18 -08:00
Alon Albert
a3e20a1fa1 am 2d314d12: (-s ours) am b79db4cd: (-s ours) am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 
* commit '2d314d1282067518bcd34015f629c5d3e6ff15a1':
  DO NOT MERGE - Clear backoffs on reconnect
 2011-02-16 10:28:51 -08:00
Alon Albert
47a95e69d1 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
Scott Main
5fc67b23fa am 415ef50d: am 796ce77a: docs: add breadcrumbs to articles and tutorials 
* commit '415ef50d902dddfe974f3a280733ae3769931143':
  docs: add breadcrumbs to articles and tutorials
 2011-02-16 10:25:29 -08:00
Alon Albert
92b31b9c0b 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
397de75916 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
4755273a25 Merge "Bring back auto clear backoff on reconnect Also, make sure it works this time by calling onBackoffChanged()" 2011-02-16 10:20:40 -08:00
Alon Albert
b088416f08 Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 2011-02-16 10:20:13 -08:00
Andreas Huber
1ad7de7372 Merge "Remove legacy, AwesomePlayer-based http live implementation." 2011-02-16 10:12:11 -08:00
daniel_tomas
130d6278a4 am 54f9be2a: am 99e267eb: am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation 
* commit '54f9be2a265a0e06bb7f6c50acf674f47b8fe18a':
  New API added in NfcAdapter to enable/disable SE card emulation
 2011-02-16 09:45:41 -08:00
daniel_tomas
77504403b7 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
380b267bf3 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
Shimeng (Simon) Wang
fcaa73e812 Merge "Fit to screen for the first new picture with enough different width." 2011-02-16 09:28:16 -08:00
Nick Pelly
ca3eed5d34 am d8d51fed: am 8c8e9d9a: am 1df862a4: Minor doc update. 
* commit 'd8d51fed861cd36f57f1eb2542def23322379d7c':
  Minor doc update.
 2011-02-16 09:27:37 -08:00
Scott Main
4f1f69de8d am 9fb2b136: am f79bbc30: Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb 
* commit '9fb2b13600a7192031d37cd41525eacb736bcf11':
  docs: edit doc titles to match side nav and add breadcrumb links
 2011-02-16 09:25:29 -08:00
Nick Pelly
f361edacfe am 8c8e9d9a: am 1df862a4: Minor doc update. 
* commit '8c8e9d9a7f1bddbc995a5c088f19a0a3be1f6a5b':
  Minor doc update.
 2011-02-16 09:25:09 -08:00
Andreas Huber
0212f7d86f am 0bbf9667: (-s ours) 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 '0bbf96675783758b6ffdff8996d7166ae1dec15b':
  DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
 2011-02-16 09:23:11 -08:00
Nick Pelly
a112a94833 am 1df862a4: Minor doc update. 
* commit '1df862a4656bb0d7a3329311b1e243fc6db32448':
  Minor doc update.
 2011-02-16 09:23:08 -08:00
Scott Main
07bff22ad7 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
Andreas Huber
dd0630c837 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
89ddb29cc4 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
d145fc1770 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
071969e5d3 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
76890de251 am e131ccb6: am c3ebf27a: am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread 
* commit 'e131ccb615172e317501f721c30b152823c566bf':
  Adding package summary for nfc.tech package
 2011-02-15 23:01:37 -08:00
Robert Ly
6443e1a39c 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
3520ddc132 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
458488c3c4 am a925a3ca: am 9cf2fa02: docs: add breadcrumbs to developing docs 
* commit 'a925a3ca1f0aed3aeebfd8eff569d5238ccf8213':
  docs: add breadcrumbs to developing docs
 2011-02-15 20:15:50 -08:00
Scott Main
d6294056ec am c35d0ee1: am a766a8be: docs: add breadcrumbs to testing docs 
* commit 'c35d0ee105a80ed4f3c749a9f12a23adc7791ddb':
  docs: add breadcrumbs to testing docs
 2011-02-15 20:15:36 -08:00
Scott Main
1656eaba88 am f0b4f100: am f2d52938: Merge "docs: revise loader doc title" into honeycomb 
* commit 'f0b4f1007935a724cd0cfa64520ac98ee68a2266':
  docs: revise loader doc title
 2011-02-15 20:15:31 -08:00
Robert Ly
9ede8dd15d am 8700547f: am e250cbb8: Merge "doc change: add rel note links to external tools site" into honeycomb 
* commit '8700547f5565ae899e7a08271b74b69cc32c3c4f':
  doc change: add rel note links to external tools site
 2011-02-15 20:15:26 -08:00
Scott Main
e410f61827 am a64507ee: am c918e4a8: docs: add parent links to graphics docs 
* commit 'a64507eed242b62d8c29dc4e687d61b44ae9a377':
  docs: add parent links to graphics docs
 2011-02-15 20:15:12 -08:00
Scott Main
b9c0badfeb am 0ab1b326: am 13033ea5: docs: fix misc broken links 
* commit '0ab1b326c72afb2bd7798462fcdd8e5d3b440fd2':
  docs: fix misc broken links
 2011-02-15 20:15:00 -08:00
Scott Main
02a733c12d 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
dc639fb3ce 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
4b628e0f5f 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
f0d8859d14 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
8f3da81e8e 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