Commit Graph

28923 Commits

Author SHA1 Message Date
Romain Guy
d4cd30cbcf am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
* commit '7118bdec523568842e70555e353951df9f2596fd':
  Fix for #12945: ProgressBar.setMax() will always redraw.
2011-02-18 07:53:50 -08:00
Romain Guy
2151cef42c Merge "Fix for #12945: ProgressBar.setMax() will always redraw." 2011-02-17 22:40:33 -08:00
Robert Ly
d2e169c471 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
12a71bdc18 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
f54cc8c011 Merge "Doc change: fixing renderscript samples" into honeycomb 2011-02-17 18:53:36 -08:00
Maarten Hooft
1db90719b3 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-02-17 17:17:40 -08:00
Joe Malin
ebdce77ba7 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
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
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
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
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
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
Robert Greenwalt
b9ce99c940 Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread 2011-02-16 10:44:26 -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
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
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
b088416f08 Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 2011-02-16 10:20:13 -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
Nick Pelly
f361edacfe am 8c8e9d9a: am 1df862a4: Minor doc update.
* commit '8c8e9d9a7f1bddbc995a5c088f19a0a3be1f6a5b':
  Minor doc update.
2011-02-16 09:25:09 -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
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
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
Scott Main
fd9adc18ea am 13033ea5: docs: fix misc broken links
* commit '13033ea52714d48d754c6bc8fccb18514c645a47':
  docs: fix misc broken links
2011-02-15 20:08:07 -08:00
Scott Main
4f20cf6142 Merge "docs: revise loader doc title" into honeycomb 2011-02-15 17:54:28 -08:00
Robert Ly
08f2087b06 Merge "Adding package summary for nfc.tech package" into gingerbread 2011-02-15 17:44:56 -08:00
Robert Ly
707edce361 Merge "doc change: add rel note links to external tools site" into honeycomb 2011-02-15 17:38:56 -08:00
Scott Main
6dccef877e am a460a9ac: docs: add \'new\' tags and resolve some doc title regressions
* commit 'a460a9ac79bb79c2a410401a907a6bdf21320746':
  docs: add 'new' tags and resolve some doc title regressions
2011-02-15 15:49:43 -08:00
Robert Ly
1677650e20 am c00cc5f2: cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
* commit 'c00cc5f22689e0c6dba50b6bf8dc085ffca20d39':
  cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
2011-02-15 15:42:14 -08:00
John Wang
26d4c0bbfb am 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread
* commit '3901402600daa5ef9fbcae7b4b9400ee8ca1a317':
  Only decode EXT1 tag when it is available.
2011-02-15 12:40:49 -08:00
John Wang
e85d8d6620 am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread
* commit '29853a356bb6ddb094df6d0f5dd04e2a63f25147':
  Only decode EXT1 tag when it is available.
2011-02-15 12:38:38 -08:00
John Wang
6ac7359b83 Merge "Only decode EXT1 tag when it is available." into gingerbread 2011-02-15 12:34:37 -08:00
Joe Malin
51b31fd535 am 6d1387b6: Merge "SDK docs: Hierarchy Viewer V2" into honeycomb
* commit '6d1387b6ecf0aaea6f36472fcd1a499824fd30b5':
  SDK docs: Hierarchy Viewer V2
2011-02-15 12:34:35 -08:00
Joe Malin
29443fa8df Merge "SDK docs: Hierarchy Viewer V2" into honeycomb 2011-02-15 12:32:48 -08:00