OSDN Git Service
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:58:36 +0000 (07:58 -0800)]
am
d4c8cec0: am
9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge"
* commit '
d4c8cec094dbf7bcfa3f31bedae15e5c65b13e94':
Delete browerplugin tests - do not merge
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:39:47 +0000 (07:39 -0800)]
am
9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge"
* commit '
9720323a5138acafbe30da38d61eeac469b675a4':
Delete browerplugin tests - do not merge
Robert Greenwalt [Sat, 29 Jan 2011 14:55:38 +0000 (06:55 -0800)]
am
6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread
* commit '
6b739dc7292452227cdd8abd90658f4db8f0ce70':
Add some network types that OEM's are asking for.
Robert Greenwalt [Sat, 29 Jan 2011 14:38:35 +0000 (06:38 -0800)]
Merge "Add some network types that OEM's are asking for." into gingerbread
Jean-Baptiste Queru [Fri, 28 Jan 2011 23:26:59 +0000 (15:26 -0800)]
Merge "Delete browerplugin tests - do not merge"
Eric Fischer [Fri, 28 Jan 2011 22:19:36 +0000 (14:19 -0800)]
am
5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
5f2def8cfdad2491a646be69347444a3be6ddf84':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 28 Jan 2011 22:10:43 +0000 (14:10 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Dirk Dougherty [Fri, 28 Jan 2011 20:00:51 +0000 (12:00 -0800)]
am
fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
* commit '
fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
Doc change: Add time-lapse video to 3.0 highlights.
Dirk Dougherty [Fri, 28 Jan 2011 19:57:42 +0000 (11:57 -0800)]
Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
Andreas Huber [Fri, 28 Jan 2011 18:42:10 +0000 (10:42 -0800)]
am
b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
* commit '
b6c2e2b46c574a90450438cccfb6cb97b7edc20f':
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
Eric Laurent [Fri, 28 Jan 2011 02:40:42 +0000 (18:40 -0800)]
am
0ef57993: Merge "Fix issue
2988031." into gingerbread
* commit '
0ef579939e6c96fcd2b42b164c5debf535a6a53b':
Fix issue
2988031.
Eric Laurent [Fri, 28 Jan 2011 02:37:04 +0000 (18:37 -0800)]
Merge "Fix issue
2988031." into gingerbread
Jim Miller [Fri, 28 Jan 2011 02:25:12 +0000 (18:25 -0800)]
am
226e5756: Merge "Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
* commit '
226e57563c3110aa688fc41f10b7a96cd21b6231':
Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
Jim Miller [Fri, 28 Jan 2011 02:22:14 +0000 (18:22 -0800)]
Merge "Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
Nick Pelly [Fri, 28 Jan 2011 00:26:28 +0000 (16:26 -0800)]
am
d350dc04: Merge "API: Make close() throw an IOException." into gingerbread
* commit '
d350dc0492fab3614749955f5dcf21ec1c522b24':
API: Make close() throw an IOException.
Nick Pelly [Fri, 28 Jan 2011 00:23:35 +0000 (16:23 -0800)]
Merge "API: Make close() throw an IOException." into gingerbread
Eric Fischer [Thu, 27 Jan 2011 23:00:43 +0000 (15:00 -0800)]
am
3d73c4d3: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
3d73c4d386e5ae66aa5c472342207728ab4fbf3a':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Jan 2011 22:56:29 +0000 (14:56 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Nick Pelly [Thu, 27 Jan 2011 22:12:49 +0000 (14:12 -0800)]
am
21d0a173: Fix build - javadoc.
* commit '
21d0a173f138563e2eaba286b0eb505f987918a9':
Fix build - javadoc.
Scott Main [Thu, 27 Jan 2011 21:29:13 +0000 (13:29 -0800)]
am
7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread
* commit '
7a9741caca3ec0f6f3fd95426f2bd03b45b57758':
cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
Nick Pelly [Thu, 27 Jan 2011 21:25:52 +0000 (13:25 -0800)]
am
eab0e97b: Merge "Clean up MifareUltralight API." into gingerbread
* commit '
eab0e97bf0951057a0624cdde2f4bc5434ade0ac':
Clean up MifareUltralight API.
Scott Main [Thu, 27 Jan 2011 21:25:10 +0000 (13:25 -0800)]
Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final" into gingerbread
Nick Pelly [Thu, 27 Jan 2011 20:23:53 +0000 (12:23 -0800)]
Merge "Clean up MifareUltralight API." into gingerbread
Robert Greenwalt [Thu, 27 Jan 2011 18:20:33 +0000 (10:20 -0800)]
am
89a54408: Merge "Update networktype before sending state change." into gingerbread
* commit '
89a544088fcfa849be0d8824a2ac0a545950847b':
Update networktype before sending state change.
Robert Greenwalt [Thu, 27 Jan 2011 18:17:33 +0000 (10:17 -0800)]
Merge "Update networktype before sending state change." into gingerbread
Dirk Dougherty [Thu, 27 Jan 2011 18:08:09 +0000 (10:08 -0800)]
am
591a5f86: Doc change: fix adt archive filename.
* commit '
591a5f86bd4b3f1732b935daad909e4e63149f01':
Doc change: fix adt archive filename.
Scott Main [Thu, 27 Jan 2011 02:37:22 +0000 (18:37 -0800)]
am
ba3dd323: enable preview mode for docs and add api level 10 flag for api level diffs
* commit '
ba3dd32357b47ab0b55a1976bbafc225df78a59d':
enable preview mode for docs and add api level 10 flag for api level diffs
Scott Main [Thu, 27 Jan 2011 01:56:26 +0000 (17:56 -0800)]
am
a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
* commit '
a7ce2f04ef0ae548370eebd1314558f24f40e8f0':
catchup the gingerbread branch to gingerbread-docs for all sdk docs
Scott Main [Thu, 27 Jan 2011 01:52:08 +0000 (17:52 -0800)]
Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
Andreas Huber [Thu, 27 Jan 2011 00:40:04 +0000 (16:40 -0800)]
am
2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
* commit '
2dce338e01678620db0734fc3d84bcb3f2512d62':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
Jeff Brown [Wed, 26 Jan 2011 23:03:32 +0000 (15:03 -0800)]
am
7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps."
* commit '
7b448b8a6c1ababc3a3e4553ebe9bac7473051c8':
Move keymaps from sdk/emulator/keymaps.
Jeff Brown [Wed, 26 Jan 2011 22:25:08 +0000 (14:25 -0800)]
Merge "Move keymaps from sdk/emulator/keymaps."
Dianne Hackborn [Wed, 26 Jan 2011 22:08:30 +0000 (14:08 -0800)]
am
1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
* commit '
1d07b5bc9b0a9e3de4495834242548a600cae1d8':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
Jean-Michel Trivi [Wed, 26 Jan 2011 22:05:18 +0000 (14:05 -0800)]
am
2ba92c71: do not merge bug
3370834 Cherrypick from master
* commit '
2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug
3370834 Cherrypick from master
Dianne Hackborn [Wed, 26 Jan 2011 21:59:42 +0000 (13:59 -0800)]
Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
Kenny Root [Wed, 26 Jan 2011 17:25:43 +0000 (09:25 -0800)]
am
138757db: Merge "Make OBB results a one-way call" into gingerbread
* commit '
138757db4f19cb626ef5c1d371d4fca004304a08':
Make OBB results a one-way call
Kenny Root [Wed, 26 Jan 2011 17:17:28 +0000 (09:17 -0800)]
Merge "Make OBB results a one-way call" into gingerbread
Jeff Hamilton [Wed, 26 Jan 2011 00:15:58 +0000 (16:15 -0800)]
am
c33acae9: Merge "Fix the build, proper current.xml." into gingerbread
* commit '
c33acae9060162c5d2c28613b71c3bb1e0ef4c1c':
Fix the build, proper current.xml.
Jeff Hamilton [Wed, 26 Jan 2011 00:11:37 +0000 (16:11 -0800)]
Merge "Fix the build, proper current.xml." into gingerbread
Brad Fitzpatrick [Tue, 25 Jan 2011 23:44:33 +0000 (15:44 -0800)]
am
a206efcf: Merge "android.os.Message: respect sPoolSize"
* commit '
a206efcf8d2e56cbd0d1de125b29b45fc6cc8431':
android.os.Message: respect sPoolSize
Brad Fitzpatrick [Tue, 25 Jan 2011 23:12:18 +0000 (15:12 -0800)]
Merge "android.os.Message: respect sPoolSize"
Mathias Agopian [Tue, 25 Jan 2011 22:46:40 +0000 (14:46 -0800)]
am
239fd805: Merge "fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
* commit '
239fd805ef7c0e4116b0a89e20caaf287e91f017':
fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
Mathias Agopian [Tue, 25 Jan 2011 22:46:35 +0000 (14:46 -0800)]
am
1955a5c9: Merge "partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
* commit '
1955a5c9da421dc89bb1a1dd3d3193159192cde9':
partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
Mathias Agopian [Tue, 25 Jan 2011 22:46:31 +0000 (14:46 -0800)]
am
d0441f92: Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
* commit '
d0441f921b2b1879fb44041f521d9bfaa5a547d0':
fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
Mathias Agopian [Tue, 25 Jan 2011 22:46:27 +0000 (14:46 -0800)]
am
043a3cdd: Merge "workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
* commit '
043a3cddf67e2baf38711bcb125084599f8f9802':
workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)
Mathias Agopian [Tue, 25 Jan 2011 22:46:22 +0000 (14:46 -0800)]
am
d3fcd0a1: Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
* commit '
d3fcd0a1c923498921107bb44fbc8b24582a170a':
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
Mathias Agopian [Tue, 25 Jan 2011 22:43:21 +0000 (14:43 -0800)]
Merge "fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:43:14 +0000 (14:43 -0800)]
Merge "partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:43:09 +0000 (14:43 -0800)]
Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:43:05 +0000 (14:43 -0800)]
Merge "workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:42:59 +0000 (14:42 -0800)]
Merge "minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
Jeff Hamilton [Tue, 25 Jan 2011 22:41:55 +0000 (14:41 -0800)]
am
f126ad3b: Merge "Use classnames instead of ints for NFC techs." into gingerbread
* commit '
f126ad3b6484ef62eed202f1f49cc4557c0a3848':
Use classnames instead of ints for NFC techs.
Jeff Hamilton [Tue, 25 Jan 2011 22:35:46 +0000 (14:35 -0800)]
Merge "Use classnames instead of ints for NFC techs." into gingerbread
Mathias Agopian [Tue, 18 Jan 2011 23:51:30 +0000 (15:51 -0800)]
fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
Generally we never want to lock a buffer for write access if it is at
the "head" on the surfaceflinger side. The only exception (1) is when
the buffer is not currently in use AND there is at least one queued
buffer -- in which case, SurfaceFlinger will never use said buffer
anymore, because on the next composition around, it will be able to
retire the first queued buffer.
The logic above relies on SurfaceFlinger always retiring
and locking a buffer before composition -- unfortunately this
didn't happen during a screenshot.
This could leave us in a situation where a buffer is locked by the
application for write, and used by SurfaceFlinger for texturing,
causing a hang.
Here, we fix this issue by never assuming the exception (1), it was
intended as an optimization allowing ANativeWindow::lockBuffer() to
return sooner and was justified when most of SF composition was
done in software. The actual buffer locking is now ensured by
gralloc. We could have handled screenshots in a similar way to
a regular composition, but it could have caused glitches on screen,
essentially, taking a screenshot could cause to skip a frame.
now that we removed the notion of a "inUse" buffer in surfaceflinger
a lot of code can be simplified / removed.
noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete"
is also gone.
Mathias Agopian [Sat, 15 Jan 2011 01:37:42 +0000 (17:37 -0800)]
partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
We used to guarantee that a layer in SurfaceFlinger would never be
destroyed before all references (to its ISurface) on the client
side would be released. At some point, this guarantee got
relaxed to allow to free gralloc resources sooner. This last
change was incorrect, because:
- in implementations with reference-counting the gralloc resources
wouldn't be released anyways, until all the mapping were gone
- in implementations without ref counting, the client side
would most likely crash or do something bad
- it also caused the SharedBufferStack slot to be reallocated
to another surface, which could be problematic if the client
continued to use the surface after the window manager destroyed it.
So, we essentially reinstate the guarantee that layers won't be
destroyed until after all references to their ISurface are
released.
NOTE: This doesn't entirely fix
3306150 because there is another
problem there where the Browser continues to use a surface after it
has been destroyed.
also improve SurfaceFlinger 'dumpsys' log
list the purgatory, which shows windows that have been closed,
but for which the client still has references.
Mathias Agopian [Fri, 17 Dec 2010 02:46:17 +0000 (18:46 -0800)]
fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
we were not clearing the screen entirely, which caused garbage when
the screen wasn't entirely covered by windows.
Change-Id: Ia7aa13c36a8a314e0e8427d419b16b9aa2165ddf
Mathias Agopian [Wed, 15 Dec 2010 22:41:59 +0000 (14:41 -0800)]
workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)
we make sure to call compositionComplete after everytime we do
composition with the GPU (even for the screenshot case), which is
where the buffer locks are released.
Change-Id: I450430d1e4d1ee9ce1023970642378c42cdcfa4c
Mathias Agopian [Tue, 14 Dec 2010 00:47:31 +0000 (16:47 -0800)]
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
Change-Id: I1ddbbbec4fa5b2521ef3787bc28efe1bc90d0060
Marco Nelissen [Tue, 25 Jan 2011 18:11:09 +0000 (10:11 -0800)]
am
c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread
* commit '
c929677e017759047d94599faa1b80ebe278fefb':
Increase the number of useful bits in the spectrum.
Marco Nelissen [Tue, 25 Jan 2011 18:06:16 +0000 (10:06 -0800)]
Merge "Increase the number of useful bits in the spectrum." into gingerbread
Nick Pelly [Tue, 25 Jan 2011 16:41:35 +0000 (08:41 -0800)]
am
b134223f: Make Mifare Classic increment/decrement operands little endian
* commit '
b134223f91c8801d577cb72e92a37cb65fec717a':
Make Mifare Classic increment/decrement operands little endian
Hung-ying Tyan [Tue, 25 Jan 2011 05:46:23 +0000 (21:46 -0800)]
am
cc019c0c: Merge "Get mute state from active call." into gingerbread
* commit '
cc019c0caa0dd984404dea4d6623ae9d7b8474f1':
Get mute state from active call.
Hung-ying Tyan [Tue, 25 Jan 2011 05:13:08 +0000 (21:13 -0800)]
Merge "Get mute state from active call." into gingerbread
Hung-ying Tyan [Tue, 25 Jan 2011 03:44:56 +0000 (19:44 -0800)]
am
14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread
* commit '
14b6d0620b42d1bb3a55778ba452d838a0d89223':
SipService: registers broadcast receivers on demand.
SipService: release wake lock for cancelled tasks.
Hung-ying Tyan [Tue, 25 Jan 2011 03:41:42 +0000 (19:41 -0800)]
Merge changes Ib70e0cf2,I0691cd70 into gingerbread
* changes:
SipService: registers broadcast receivers on demand.
SipService: release wake lock for cancelled tasks.
Jeff Brown [Tue, 25 Jan 2011 01:38:32 +0000 (17:38 -0800)]
am
d8bdc06f: Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
* commit '
d8bdc06f8139231f1edc1a8bf22b637ebb790605':
Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
Andreas Huber [Tue, 25 Jan 2011 00:30:12 +0000 (16:30 -0800)]
am
efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
* commit '
efebdf4bd4da35bc50c7d81450c8473697f6654a':
DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
Brad Fitzpatrick [Mon, 24 Jan 2011 22:03:48 +0000 (14:03 -0800)]
am
996de2dd: Merge "Avoid using String.format in MediaRecorder"
* commit '
996de2dd41498a48be6821cfa0a81b16c0b3975c':
Avoid using String.format in MediaRecorder
Brad Fitzpatrick [Mon, 24 Jan 2011 21:36:15 +0000 (13:36 -0800)]
Merge "Avoid using String.format in MediaRecorder"
Justin Ho [Mon, 24 Jan 2011 21:08:54 +0000 (13:08 -0800)]
am
28c4f69a: Updated checkbox assets
* commit '
28c4f69a938766076c14e8f5b07951ec2a9f610d':
Updated checkbox assets
Arnaud Ferir [Mon, 24 Jan 2011 18:49:40 +0000 (10:49 -0800)]
am
5e81a6e2: Fix trace mismatch.
* commit '
5e81a6e21e9977acd9dfafaf030bf51c8572a98f':
Fix trace mismatch.
Sylvain Fonteneau [Mon, 24 Jan 2011 18:49:36 +0000 (10:49 -0800)]
am
c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
* commit '
c5a418ecb7681159ae6674a4d91177c6841537b1':
Handle mock tags in android.nfc.Tag conversion to Parcel.
John Wang [Mon, 24 Jan 2011 17:26:56 +0000 (09:26 -0800)]
am
93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
* commit '
93300ce2d398195d5616a2e924eb4a785274538e':
Enable recovery in RIL wakelock release check.
John Wang [Mon, 24 Jan 2011 17:14:14 +0000 (09:14 -0800)]
Merge "Enable recovery in RIL wakelock release check." into gingerbread
Nick Pelly [Mon, 24 Jan 2011 06:14:54 +0000 (22:14 -0800)]
am
c896d85c: Merge "Add operands to mifare classic increment, decrement." into gingerbread
* commit '
c896d85c15d8a6c98c93df57d88481b89eb878f5':
Add operands to mifare classic increment, decrement.
Nick Pelly [Mon, 24 Jan 2011 06:12:25 +0000 (22:12 -0800)]
Merge "Add operands to mifare classic increment, decrement." into gingerbread
Nick Pelly [Mon, 24 Jan 2011 05:39:39 +0000 (21:39 -0800)]
am
da01b4ab: Merge "Make MifareClassic methods more consistent." into gingerbread
* commit '
da01b4abb817fcebdf33c27aaa6a1ac4a61beee0':
Make MifareClassic methods more consistent.
Nick Pelly [Mon, 24 Jan 2011 05:36:14 +0000 (21:36 -0800)]
Merge "Make MifareClassic methods more consistent." into gingerbread
Jeff Hamilton [Mon, 24 Jan 2011 03:28:17 +0000 (19:28 -0800)]
am
e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
* commit '
e1e70c57613956dff0f14829f6385e26c323b609':
Allow null filters for foreground dispatch to act as catch all.
Jeff Hamilton [Mon, 24 Jan 2011 03:17:22 +0000 (19:17 -0800)]
Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
Jim Miller [Sun, 23 Jan 2011 22:30:07 +0000 (14:30 -0800)]
am
42a46157: Fix
3379239: Catch exceptions from workaround for OOM.
* commit '
42a461570b9c5502959e429c4f16ca5ca860c4f2':
Fix
3379239: Catch exceptions from workaround for OOM.
Dianne Hackborn [Sun, 23 Jan 2011 20:57:33 +0000 (12:57 -0800)]
am
bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"
* commit '
bcf2adeb10c41becec3baa2bcb8de9212272399a':
aapt: Allow raw "%" in unformatted string-arrays
Dianne Hackborn [Sun, 23 Jan 2011 20:44:13 +0000 (12:44 -0800)]
Merge "aapt: Allow raw "%" in unformatted string-arrays"
Jeff Brown [Sun, 23 Jan 2011 05:32:58 +0000 (21:32 -0800)]
am
265cf2e7: Merge "Fix getSwitchState."
* commit '
265cf2e76bef9ee369a7d43d567a22a0c39355ef':
Fix getSwitchState.
Jeff Brown [Sun, 23 Jan 2011 05:23:19 +0000 (21:23 -0800)]
Merge "Fix getSwitchState."
Dianne Hackborn [Sat, 22 Jan 2011 19:50:41 +0000 (11:50 -0800)]
am
35f4d32d: Merge "frameworks/base: Track owner in appropriate owners list of Uri"
* commit '
35f4d32dc2f0c383323e780ecc7e2764704c5d2c':
frameworks/base: Track owner in appropriate owners list of Uri
Dianne Hackborn [Sat, 22 Jan 2011 19:26:05 +0000 (11:26 -0800)]
Merge "frameworks/base: Track owner in appropriate owners list of Uri"
Jaikumar Ganesh [Sat, 22 Jan 2011 05:36:32 +0000 (21:36 -0800)]
am
1c9761e3: Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
* commit '
1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b':
Do Not Merge Connect other profiles when priority is auto connect.
Jaikumar Ganesh [Sat, 22 Jan 2011 05:25:01 +0000 (21:25 -0800)]
Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
John Reck [Fri, 21 Jan 2011 22:06:08 +0000 (14:06 -0800)]
am
398a589c: Merge "DO NOT MERGE - Create db path if it doesn\'t exit" into gingerbread
* commit '
398a589ccea744556732b25097412dbb22c51271':
DO NOT MERGE - Create db path if it doesn't exit
John Reck [Fri, 21 Jan 2011 22:03:30 +0000 (14:03 -0800)]
Merge "DO NOT MERGE - Create db path if it doesn't exit" into gingerbread
Jeff Hamilton [Fri, 21 Jan 2011 20:33:55 +0000 (12:33 -0800)]
am
dc54a8c7: Merge "API changes for NFC." into gingerbread
* commit '
dc54a8c742e96d6ea8ef3e18c0f2ee1235899599':
API changes for NFC.
Jeff Hamilton [Fri, 21 Jan 2011 19:34:20 +0000 (11:34 -0800)]
Merge "API changes for NFC." into gingerbread
Dianne Hackborn [Fri, 21 Jan 2011 17:55:16 +0000 (09:55 -0800)]
am
a8069f34: Merge "Fixes Keyboard availability in "Providing Resources" documentation page."
* commit '
a8069f34f65bee858d87fd232a872a62e85a502b':
Fixes Keyboard availability in "Providing Resources" documentation page.
Dianne Hackborn [Fri, 21 Jan 2011 17:23:29 +0000 (09:23 -0800)]
Merge "Fixes Keyboard availability in "Providing Resources" documentation page."
Jean-Michel Trivi [Fri, 21 Jan 2011 17:15:02 +0000 (09:15 -0800)]
am
a314f32b: Merge "Bug
3365937 notify TTS initialization listener of binding errors" into gingerbread
* commit '
a314f32ba92d46687aef9f420eb61491eff485cf':
Bug
3365937 notify TTS initialization listener of binding errors
Jean-Michel Trivi [Fri, 21 Jan 2011 17:09:30 +0000 (09:09 -0800)]
Merge "Bug
3365937 notify TTS initialization listener of binding errors" into gingerbread
Eric Laurent [Fri, 21 Jan 2011 05:46:21 +0000 (21:46 -0800)]
am
c5694ebd: Merge "do not merge - Fix issue
3371096." into gingerbread
* commit '
c5694ebda9a50be391ef9cfaa7f93e9efb04b6c5':
do not merge - Fix issue
3371096.
Dianne Hackborn [Fri, 21 Jan 2011 02:18:32 +0000 (18:18 -0800)]
am
11576102: Fix issue #
3373438: Update GBMR versions
* commit '
11576102a9794ef964a08bc372dc09803f58997a':
Fix issue #
3373438: Update GBMR versions
Eric Laurent [Fri, 21 Jan 2011 01:43:04 +0000 (17:43 -0800)]
Merge "do not merge - Fix issue
3371096." into gingerbread