Nick Pelly
95e4f1e8b3
Merge "Corrected MIFARE default key set" into gingerbread
2010-12-07 09:29:21 -08:00
Chung-yih Wang
823f079024
Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
2010-12-06 22:07:59 -08:00
Nick Pelly
7592f8f4d8
Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread
2010-12-06 18:41:36 -08:00
Mathias Agopian
f219856d5e
Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL" into gingerbread
2010-12-06 18:20:09 -08:00
Nick Pelly
2361dd244d
Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
2010-12-06 17:43:46 -08:00
Nick Pelly
4995b0cd7e
Merge gingerbread-nfc into gingerbread
2010-12-05 18:08:16 -08:00
Nick Pelly
54c9d4a79a
Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread
2010-12-05 14:46:29 -08:00
Nick Pelly
130f48f5bc
Merge branch gingerbread-nfc into gingerbread.
...
Change-Id: I37d657a16061fddfbb0993463f24d6d3945cddd1
Signed-off-by: Nick Pelly <npelly@google.com>
2010-12-05 14:45:29 -08:00
Irfan Sheriff
10484ac22a
Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
2010-12-03 17:58:17 -08:00
Mathias Agopian
644bb2a29e
[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL
...
(there are multiple bugs this should fix)
we now use the EGL_NATIVE_VISUAL_ID of a config to set
the ANativeWindow's format from eglCreateWindowSurface(),
this guarantees that the surface's format will match
whatever EGLConfig the user chose.
this should fix all current and future config/surface format
mismatch and allow users to easily select 32-bits surfaces.
Change-Id: I3835d0eb70c75eeecded3c3509a0a8207554c98b
2010-12-03 14:15:40 -08:00
Hung-ying Tyan
33f4f32967
Merge "Set AudioGroup mode according to audio settings" into gingerbread
2010-12-02 17:50:33 -08:00
Xia Wang
147abbd117
Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread
2010-12-02 13:40:23 -08:00
James Dong
11cdf95594
Merge "Be conservative in estimating the file size limit." into gingerbread
2010-12-02 10:13:36 -08:00
Jeff Hamilton
1c79a55b61
Merge remote branch 'ohd/gingerbread' into merge
2010-12-02 09:41:16 -06:00
Eric Laurent
8217671a50
Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." into gingerbread
2010-12-01 15:59:31 -08:00
Kenny Root
8e41fd2aa5
Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread
2010-12-01 14:18:23 -08:00
Scott Main
1e0f732364
am a45d6937: docs: dashboard update
...
* commit 'a45d693757c14c2d97a81f1fd8faa3ba38b53021':
docs: dashboard update
2010-12-01 12:59:42 -08:00
Eric Laurent
4db2fd929a
Merge "Fix issue 3142808." into gingerbread
2010-12-01 11:26:37 -08:00
Irfan Sheriff
a29e6d9620
Merge "DO NOT MERGE Fix status fetch from supplicant" into gingerbread
2010-12-01 10:17:56 -08:00
Irfan Sheriff
d4d5dab12f
Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread
2010-12-01 09:51:27 -08:00
Brad Fitzpatrick
e5f05b8739
Merge "[don't auto-merge] Don't re-read SharedPreferences unnecessarily." into gingerbread
2010-12-01 08:46:52 -08:00
Hung-ying Tyan
415474e42a
Merge "Do not suppress error feedback during a SIP call." into gingerbread
2010-11-30 22:53:26 -08:00
Mathias Agopian
bcd69459f5
Merge "allow rotation-vector to have 4 components" into gingerbread
2010-11-30 15:38:38 -08:00
David Brown
6d54e4370b
Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread
2010-11-30 15:20:45 -08:00
Andreas Huber
faa4e79c76
Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread
2010-11-30 14:30:00 -08:00
Mathias Agopian
3bf9626696
Merge "Uses 4-th order low-pass for extracting gravity." into gingerbread
2010-11-30 14:15:23 -08:00
Andreas Huber
e0dbb934e6
Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback." into gingerbread
2010-11-30 14:06:26 -08:00
Mathias Agopian
048183ff24
Merge "don't attempt to normalize the rotation vector" into gingerbread
2010-11-30 14:03:43 -08:00
Robert Ly
09103e07f8
Merge "Doc change: updating ndk download and overview page" into gingerbread
2010-11-30 13:51:05 -08:00
Andreas Huber
03d305cfea
Merge "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread
2010-11-30 13:00:14 -08:00
Eric Laurent
528648d56f
Merge "Update java doc for visualizer FFT capture." into gingerbread
2010-11-30 11:50:25 -08:00
Andreas Huber
7b3e445b94
Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread
2010-11-30 11:42:22 -08:00
Dirk Dougherty
c17743c07e
Merge "Do not merge: Doc change: API diff report for gingerbread." into gingerbread
2010-11-30 11:27:15 -08:00
Eric Fischer
8168a694dc
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-11-30 10:12:46 -08:00
Wink Saville
89912d32b2
Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread
2010-11-30 08:15:41 -08:00
Ben Murdoch
4a49235a04
Merge "Hide plugin views when we start playing HTML5 video" into gingerbread
2010-11-30 02:43:29 -08:00
Hung-ying Tyan
570bed6841
Merge "Correct SipService.isOpened() implementation." into gingerbread
2010-11-30 00:56:57 -08:00
Hung-ying Tyan
b251e0f609
Merge "Notify SipSessions before closing SIP stack." into gingerbread
2010-11-30 00:54:51 -08:00
Hung-ying Tyan
bf08df28f3
Merge "Throw proper exceptions in SipManager" into gingerbread
2010-11-30 00:51:22 -08:00
Chia-chi Yeh
65b9c530a6
Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread
2010-11-29 22:56:56 -08:00
Irfan Sheriff
017a1e7e83
Merge "DO NOT MERGE fix runstate race condition" into gingerbread
2010-11-29 22:26:52 -08:00
Chia-chi Yeh
fa7be2cf06
Merge "RTP: Pause echo suppressor when far-end volume is low." into gingerbread
2010-11-29 22:19:57 -08:00
Trevor Johns
ccacf00df2
Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread
2010-11-24 16:21:16 -08:00
Xia Wang
5cfbd426a4
Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread
2010-11-24 13:27:53 -08:00
Scott Main
03ffe08783
am 3577f51d: docs: clarify <include> layout properties bug: 3227820
...
* commit '3577f51d4bc236a11e283855337752a7b6897f8b':
docs: clarify <include> layout properties bug: 3227820
2010-11-24 12:39:42 -08:00
Xia Wang
14073fb621
Merge "Add Wifi Tethering stress test" into gingerbread
2010-11-22 14:44:49 -08:00
Dirk Dougherty
6063a4c77a
Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
2010-11-19 19:03:03 -08:00
Wu-cheng Li
ced9b3525a
Merge "Improve camera documentation." into gingerbread
2010-11-19 18:14:43 -08:00
Mathias Agopian
2a4743599b
Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
2010-11-19 17:18:21 -08:00
Scott Main
bff5e8c308
Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462" into gingerbread
2010-11-19 16:48:50 -08:00
