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
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
Mathias Agopian
308fa7d194
Merge "allow root to call into surfaceflinger"
2011-02-15 19:46:23 -08:00
Mathias Agopian
7266fb76c9
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
Jeff Brown
3e3414636c
Add support for arbitrary axes in MotionEvents.
...
This change makes it possible to extend the set of axes that
are reported in MotionEvents by defining new axis constants.
The MotionEvent object is now backed by its C++ counterpart
to avoid having to maintain multiple representations of the
same data.
Change-Id: Ibe93c90d4b390d43c176cce48d558d20869ee608
2011-02-15 19:14:37 -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
Elliott Hughes
122c0c33d8
Merge "Use InetAddress.parseNumericAddress."
2011-02-15 17:42:55 -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
Gloria Wang
cc1c101cc5
Merge "Add AAC extractor"
2011-02-15 17:22:01 -08:00
Jim Miller
1c58fcd6c6
Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state"
2011-02-15 16:22:08 -08:00
Andreas Huber
5840c57350
Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)""
2011-02-15 15:56:20 -08:00
Scott Main
932a3b1fc7
am 40534523: am a460a9ac: docs: add \'new\' tags and resolve some doc title regressions
...
* commit '40534523304784fdc46f0de28fcaad9d3df2821b':
docs: add 'new' tags and resolve some doc title regressions
2011-02-15 15:52:25 -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
75e87fe5d6
am 090662bd: am c00cc5f2: cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
...
* commit '090662bdfc90c5f8925f554efd6ece12730a98dd':
cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
2011-02-15 15:47:56 -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
Fabrice Di Meglio
033932ad67
Merge "Small optimization when getting the spans"
2011-02-15 15:28:50 -08:00
Daisuke Miyakawa
49965ac411
Merge "Fix typo."
2011-02-15 15:21:09 -08:00
Adam Powell
f3a904902f
Merge "Fix bug 3362273 - Make overscroll glow appear within padding region"
2011-02-15 15:07:55 -08:00
Robert Greenwalt
ad8bf9c239
Merge "Remove some unused wifi dhcp code."
2011-02-15 14:26:37 -08:00
Andreas Huber
5998e8dbaa
Merge "Derive the Transport "source" attribute from the RTSP endpoint address if necessary"
2011-02-15 14:12:56 -08:00
Andreas Huber
ec8dee180d
Merge "Work around several issues with non-compliant RTSP servers."
2011-02-15 13:31:14 -08:00
Amith Yamasani
e6f6b2b117
Merge "Don't change keyboard state in setIconifiedByDefault."
2011-02-15 13:06:20 -08:00
John Wang
efe8875f38
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
2011-02-15 12:43:05 -08:00
John Wang
d946df281f
am d0789ec9: am 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread
...
* commit 'd0789ec99593bf556c88ff866a81d23449df1911':
Only decode EXT1 tag when it is available.
2011-02-15 12:43:00 -08:00
Mike Lockwood
343c52b0ed
Merge "MTP host: disable some test code"
2011-02-15 12:42:58 -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
Joe Malin
3b38a0bb4d
am 80dcc6ae: am 6d1387b6: Merge "SDK docs: Hierarchy Viewer V2" into honeycomb
...
* commit '80dcc6aebfbca724f49c83d30cdad51ef980f0db':
SDK docs: Hierarchy Viewer V2
2011-02-15 12:37:36 -08:00
Mathias Agopian
64d0ef9cc4
Merge "fix [3452769] SensorEventListener can cause a java allocation at each received event [external]"
2011-02-15 12:34:48 -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