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

30494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
c0f6a1c62d Merge "Adds localization support for incognito start page" 2011-02-16 15:05:04 -08:00
Basavapatna Dattaguru
a21ca74799 Merge "VideoEditor:Issue ID: 3431967" 2011-02-16 14:54:08 -08:00
Andreas Huber
42dd9518cd am 09b18c2f: (-s ours) am 79a97489: (-s ours) am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests. 
* commit '09b18c2f1d5ca6cf25352ae633f2121556a516ab':
  DO NOT MERGE: Respond to RTSP server->client requests.
 2011-02-16 14:31:27 -08:00
Andreas Huber
5b620a9624 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
38519517c5 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
0182a369ac Merge "Respond to RTSP server->client requests." 2011-02-16 13:27:02 -08:00
Irfan Sheriff
395d332627 Merge "Fix wifi watchdog to use InetAddress" 2011-02-16 13:17:54 -08:00
Dmitri Plotnikov
a37adb7509 Merge "Setting copiedSize to 0 when value is null" 2011-02-16 13:15:15 -08:00
Brian Carlstrom
e46e35896c Merge "Deprecate non-X509Certificate SslCertificate constructors" 2011-02-16 12:56:36 -08:00
Shimeng (Simon) Wang
0ba09deeed Merge "Remember zoom overview state since the postscale callback is async." 2011-02-16 12:55:47 -08:00
Scott Main
cd3ec93df5 am 869f1f3e: am 0643d7c4: docs: add new tag for tasks doc 
* commit '869f1f3e9024d66c57bc30d3afb821074a9139f7':
  docs: add new tag for tasks doc
 2011-02-16 12:45:34 -08:00
Mike Lockwood
8c4ed9af62 Merge "UsbManager: New APIs for USB accessories" 2011-02-16 12:42:35 -08:00
Scott Main
7a9d90dea4 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
Kenny Root
61bfd84daf Merge "Clean up use of HAVE_ANDROID_OS" 2011-02-16 12:33:28 -08:00
James Dong
9036b44433 Merge "Change the media player stress test to repor the total number of failure and the total number of info. Register the surface callback in the test application bug# 2909064" 2011-02-16 12:27:08 -08:00
Andy Stadler
266cd13b23 am 04ddff69: am b1835085: Merge "@hide DPM global proxy settings" into honeycomb 
* commit '04ddff6905a72d0d39d791eaba33546fb66b15a6':
  @hide DPM global proxy settings
 2011-02-16 12:22:57 -08:00
Andy Stadler
e9b1ce3615 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
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