Kenny Root
bb9d394b21
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
Andreas Huber
9497144281
Merge "Remove legacy, AwesomePlayer-based http live implementation."
2011-02-16 10:12:11 -08:00
daniel_tomas
675a6527a5
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
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
Shimeng (Simon) Wang
0f7c903aa1
Merge "Fit to screen for the first new picture with enough different width."
2011-02-16 09:28:16 -08:00
Nick Pelly
ef12256ca5
am d8d51fed: am 8c8e9d9a: am 1df862a4: Minor doc update.
...
* commit 'd8d51fed861cd36f57f1eb2542def23322379d7c':
Minor doc update.
2011-02-16 09:27:37 -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
Scott Main
3e98093c59
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
d8d51fed86
am 8c8e9d9a: am 1df862a4: Minor doc update.
...
* commit '8c8e9d9a7f1bddbc995a5c088f19a0a3be1f6a5b':
Minor doc update.
2011-02-16 09:25:09 -08:00
Andreas Huber
65e53c664f
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
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
Andreas Huber
d6c421f1a0
Remove legacy, AwesomePlayer-based http live implementation.
...
Change-Id: I455d0faa5612dcd4d2bb6f2b3c7b64a1caaabf69
2011-02-16 09:19:40 -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
b424227509
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
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
512474b0cd
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
4a010eeb89
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
e502c7c0ca
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
73000f8c44
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
ae8a1c635e
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
55cdc0c904
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
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
Mathias Agopian
215a0dbe8e
Merge "allow root to call into surfaceflinger"
2011-02-15 19:46:23 -08:00
Mathias Agopian
492277d2e2
allow root to call into surfaceflinger
...
this is useful for running standalone tests
with standalone SurfaceFlinger.
Change-Id: I08d054f6214affa3a777a82765f4e0bd256ba26d
2011-02-15 19:27:47 -08:00
Ken Wakasa
a5e9ffa35c
Fix a bug in canAddToLastInputMethod()
...
bug: 3456057
Change-Id: I977e984aafb36fdb83ac05d19fe0c7324a36d0c5
2011-02-16 11:55:23 +09:00
Scott Main
9cf2fa023b
docs: add breadcrumbs to developing docs
...
Change-Id: Id63b53a77daff2fa45424dc6607a467dc55a10e3
2011-02-15 18:26:07 -08:00
Shimeng (Simon) Wang
7c6aaf062b
Fit to screen for the first new picture with enough different width.
...
This is to fix cases where the content width is keep changing due to
animation, such as 2011 google io site.
issue: 3451476
Change-Id: I8b1ba27a34e37a18116131ecc60391975ef75788
2011-02-15 18:08:30 -08:00
Scott Main
a766a8bee2
docs: add breadcrumbs to testing docs
...
Change-Id: Ib2b3ef1871fba52b8f34513e9279acb98d26fb6c
2011-02-15 18:02:55 -08:00
Scott Main
92c8724052
docs: edit doc titles to match side nav and add breadcrumb links
...
Change-Id: Ie3dbc42122119c23baeb83b005fff3b8995f744a
2011-02-15 17:59:36 -08:00
Scott Main
f2d5293844
Merge "docs: revise loader doc title" into honeycomb
2011-02-15 17:54:28 -08:00
Scott Main
a564745035
docs: revise loader doc title
...
Change-Id: I232eb1da8270625afa0f26951dbd20d9a61fe15d
2011-02-15 17:50:33 -08:00
Robert Ly
4bebbe5fea
Merge "Adding package summary for nfc.tech package" into gingerbread
2011-02-15 17:44:56 -08:00
Elliott Hughes
32c3b81bbc
Merge "Use InetAddress.parseNumericAddress."
2011-02-15 17:42:55 -08:00
Robert Ly
2deeefeb5e
Adding package summary for nfc.tech package
...
Change-Id: Ibbf55c21dcaf48b4eb369e78c54fb1023abb3cb3
2011-02-15 17:41:47 -08:00
Robert Ly
e250cbb8d5
Merge "doc change: add rel note links to external tools site" into honeycomb
2011-02-15 17:38:56 -08:00
Scott Main
c918e4a86d
docs: add parent links to graphics docs
...
Change-Id: I8dafe4c717e9169bf85cdf0594553558827f73ae
2011-02-15 17:37:14 -08:00
Gloria Wang
94f4019994
Merge "Add AAC extractor"
2011-02-15 17:22:01 -08:00
Gloria Wang
c5b0abf900
Add AAC extractor
...
Change-Id: Iedb08525ac72e65ba98e5c791734da0720a0e3f6
2011-02-15 17:16:22 -08:00