external_qemu.git - external/qemu

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \|	am 8b657e5d: Fix a crash when using an 8MB SD Card image file.	David 'Digit' Turner	2009-12-01	4	-6/+39
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '8b657e5deaa03b989b0b36791fcf2aa6b2882656' into eclair-plus-aosp * commit '8b657e5deaa03b989b0b36791fcf2aa6b2882656': Fix a crash when using an 8MB SD Card image file.
\| * \ \ \ \ \	am 5bc6182a: Fix location of prebuilt skins.	Xavier Ducrohet	2009-11-20	2	-2/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '5bc6182ae984796a6d14be7f7b8eb73c1b630b8e' into eclair-plus-aosp * commit '5bc6182ae984796a6d14be7f7b8eb73c1b630b8e': Fix location of prebuilt skins.
* \| \ \ \ \ \ \	am 7e7e1732: am e3c94626: am 39fd8497: Add two documentation files ↵	David 'Digit' Turner	2009-12-10	3	-31/+325
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	describing the format of config and skin files. Merge commit '7e7e1732e0db91e137356fe94951e73ab7219cbd' * commit '7e7e1732e0db91e137356fe94951e73ab7219cbd': Add two documentation files describing the format of config and skin files.
\| * \ \ \ \ \ \ \	am e3c94626: am 39fd8497: Add two documentation files describing the format ↵	David 'Digit' Turner	2009-12-09	3	-31/+325
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of config and skin files. Merge commit 'e3c94626074fd1331d1821fed5db043f6da02d2a' into eclair-mr2-plus-aosp * commit 'e3c94626074fd1331d1821fed5db043f6da02d2a': Add two documentation files describing the format of config and skin files.
\| \| * \ \ \ \ \ \ \	am 39fd8497: Add two documentation files describing the format of config and ↵	David 'Digit' Turner	2009-12-07	3	-31/+325
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	skin files. Merge commit '39fd8497a66aa9f78a18c8684181128361612c6f' into eclair-mr2 * commit '39fd8497a66aa9f78a18c8684181128361612c6f': Add two documentation files describing the format of config and skin files.
\| \| \| * \| \| \| \| \| \|	Add two documentation files describing the format of config and skin files.	David 'Digit' Turner	2009-12-07	3	-31/+325
\| \| \| \| \|_\|_\|/ / / \| \| \| \|/\| \| \| \| \|
* \| \| \| \| \| \| \| \|	am 0bf9b8b2: am 71e736ef: qemu: android: Add control console support for ↵	San Mehat	2009-12-10	3	-6/+149
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	managing sdcards Merge commit '0bf9b8b2e1e625ce427911deb3732ff67a58a8e3' * commit '0bf9b8b2e1e625ce427911deb3732ff67a58a8e3': qemu: android: Add control console support for managing sdcards
\| * \| \| \| \| \| \| \|	am 71e736ef: qemu: android: Add control console support for managing sdcards	San Mehat	2009-12-09	3	-6/+149
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '71e736ef90ef644130201742980b275fcca259a5' into eclair-mr2-plus-aosp * commit '71e736ef90ef644130201742980b275fcca259a5': qemu: android: Add control console support for managing sdcards
\| \| * \| \| \| \| \| \|	qemu: android: Add control console support for managing sdcards	San Mehat	2009-12-07	3	-6/+149
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: San Mehat <san@google.com> qemu: goldfish: Fix compile error introduced in refactoring Signed-off-by: San Mehat <san@google.com>
* \| \| \| \| \| \| \| \|	am 76ae1ea0: am 7ab6d35b: qemu: android: Add support for hot-adding disks as ↵	San Mehat	2009-12-10	2	-1/+47
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	well as swapping image files Merge commit '76ae1ea0e8ef78573df59d0ff4b990bf564920db' * commit '76ae1ea0e8ef78573df59d0ff4b990bf564920db': qemu: android: Add support for hot-adding disks as well as swapping image files
\| * \| \| \| \| \| \| \|	am 7ab6d35b: qemu: android: Add support for hot-adding disks as well as ↵	San Mehat	2009-12-09	2	-1/+47
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	swapping image files Merge commit '7ab6d35b98bc279a5fcd36965433a51a3c9aecd9' into eclair-mr2-plus-aosp * commit '7ab6d35b98bc279a5fcd36965433a51a3c9aecd9': qemu: android: Add support for hot-adding disks as well as swapping image files
\| \| * \| \| \| \| \| \|	qemu: android: Add support for hot-adding disks as well as swapping image files	San Mehat	2009-12-07	2	-1/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: San Mehat <san@google.com>
* \| \| \| \| \| \| \| \|	am b3e7ebed: am 68a8f7b5: qemu: android: Add support for multiple SD cards	San Mehat	2009-12-07	8	-44/+183
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'b3e7ebed293cb3dbfbaafc888aff0349e069e820' * commit 'b3e7ebed293cb3dbfbaafc888aff0349e069e820': qemu: android: Add support for multiple SD cards
\| * \| \| \| \| \| \| \|	am 68a8f7b5: qemu: android: Add support for multiple SD cards	San Mehat	2009-12-07	8	-44/+183
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '68a8f7b5ed6ee2bbbc7b67070b9c401c2276426f' into eclair-mr2-plus-aosp * commit '68a8f7b5ed6ee2bbbc7b67070b9c401c2276426f': qemu: android: Add support for multiple SD cards
\| \| * \| \| \| \| \| \|	qemu: android: Add support for multiple SD cards	San Mehat	2009-12-07	8	-44/+183
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add commandline support for an additional SD card, and plumb support to the MMC emulation layer. This patch also reworks the way the hw emulation layer registers devices. Previously, the mmc virtual hardware was only created if the sdcard image existed. Now, two virtual MMC controllers are always created as on real hardware. When a request is made to one of our controllers which has no image file bound to it, a new interrupt status indicating a command timeout is sent to the guest driver, as is standard with MMC controllers. This patch also sets the stage for supporting hot-add / hot-remove. Signed-off-by: San Mehat <san@google.com> qemu: android: Integrate card detect into the virtual mmc hardware and wire it up to the STATE_CHANGE irq status Signed-off-by: San Mehat <san@google.com> fixups from review - mmc now works with legacy drivers Signed-off-by: San Mehat <san@google.com>
* \| \| \| \| \| \| \| \|	am 51e8424b: am dc3dd741: am a383d02c: Extract emulator major version number ↵	David 'Digit' Turner	2009-12-04	5	-6/+40
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from SDK Tools package revision. Merge commit '51e8424b90a592619034f13b162cb5f6d0fee3d0' * commit '51e8424b90a592619034f13b162cb5f6d0fee3d0': Extract emulator major version number from SDK Tools package revision.
\| * \| \| \| \| \| \| \|	am dc3dd741: am a383d02c: Extract emulator major version number from SDK ↵	David 'Digit' Turner	2009-12-03	5	-6/+40
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tools package revision. Merge commit 'dc3dd741551c323bb853782656c0d693db98ecdc' into eclair-mr2-plus-aosp * commit 'dc3dd741551c323bb853782656c0d693db98ecdc': Extract emulator major version number from SDK Tools package revision.
\| \| * \| \| \| \| \| \|	am a383d02c: Extract emulator major version number from SDK Tools package ↵	David 'Digit' Turner	2009-12-03	5	-6/+40
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	revision. Merge commit 'a383d02cb57dd7dadd382654175e51354073a139' into eclair-mr2 * commit 'a383d02cb57dd7dadd382654175e51354073a139': Extract emulator major version number from SDK Tools package revision.
\| \| \| * \| \| \| \| \|	Extract emulator major version number from SDK Tools package revision.	David 'Digit' Turner	2009-12-03	5	-6/+40
\| \| \| \| \|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The minor version number is now always 0, this makes the next version number "5.0" currently in the eclair branch.
* \| \| \| \| \| \| \|	am ae4812d7: am 1c657d48: am 8b657e5d: Fix a crash when using an 8MB SD Card ↵	David 'Digit' Turner	2009-12-02	4	-6/+39
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	image file. Merge commit 'ae4812d7514dbea69f72da2386c573b63f54160b' * commit 'ae4812d7514dbea69f72da2386c573b63f54160b': Fix a crash when using an 8MB SD Card image file.
\| * \| \| \| \| \| \|	am 1c657d48: am 8b657e5d: Fix a crash when using an 8MB SD Card image file.	David 'Digit' Turner	2009-12-02	4	-6/+39
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '1c657d4855986fcf9f4df2b592b1d0ca3238defc' into eclair-mr2-plus-aosp * commit '1c657d4855986fcf9f4df2b592b1d0ca3238defc': Fix a crash when using an 8MB SD Card image file.
\| \| * \| \| \| \| \|	am 8b657e5d: Fix a crash when using an 8MB SD Card image file.	David 'Digit' Turner	2009-12-02	4	-6/+39
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '8b657e5deaa03b989b0b36791fcf2aa6b2882656' into eclair-mr2 * commit '8b657e5deaa03b989b0b36791fcf2aa6b2882656': Fix a crash when using an 8MB SD Card image file.
\| \| \| * \| \| \| \|	Fix a crash when using an 8MB SD Card image file.	David 'Digit' Turner	2009-12-01	4	-6/+39
\| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The minimum size is now 9MB. This appears to be a limitation of the emulated MMC hardware code and/or kernel device driver.
* \| \| \| \| \| \|	am 01523298: am 70dc4cbc: am 5bc6182a: Fix location of prebuilt skins.	Xavier Ducrohet	2009-11-20	2	-2/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '0152329883ccb02e9b8afedbe04ccc3519ab421a' * commit '0152329883ccb02e9b8afedbe04ccc3519ab421a': Fix location of prebuilt skins.
\| * \| \| \| \| \|	am 70dc4cbc: am 5bc6182a: Fix location of prebuilt skins.	Xavier Ducrohet	2009-11-20	2	-2/+2
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '70dc4cbc6e6b6b1813d3f0d548b6ab3c381ccbd5' into eclair-mr2-plus-aosp * commit '70dc4cbc6e6b6b1813d3f0d548b6ab3c381ccbd5': Fix location of prebuilt skins.
\| \| * \| \| \| \|	am 5bc6182a: Fix location of prebuilt skins.	Xavier Ducrohet	2009-11-20	2	-2/+2
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '5bc6182ae984796a6d14be7f7b8eb73c1b630b8e' into eclair-mr2 * commit '5bc6182ae984796a6d14be7f7b8eb73c1b630b8e': Fix location of prebuilt skins.
\| \| \| * \| \| \|	Fix location of prebuilt skins.	Xavier Ducrohet	2009-11-20	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I3ce440cff624138518dc410c304353bea1ecef91
* \| \| \| \| \| \|	am abe0c58f: merge from open-source master	Jean-Baptiste Queru	2009-11-15	0	-0/+0
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'abe0c58f33f70141c46092052e62531622362429' * commit 'abe0c58f33f70141c46092052e62531622362429': eclair snapshot
\| * \| \| \| \| \|	merge from open-source master	Jean-Baptiste Queru	2009-11-15	0	-0/+0
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	merge from open-source master	Jean-Baptiste Queru	2009-11-15	0	-0/+0
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \|	Merge commit 'goog/stage-korg-master' into HEAD
\| \| \| * \| \| \|	merge from eclair	Jean-Baptiste Queru	2009-11-15	390	-25894/+88001
\| \| \| \|\ \ \ \ \| \| \| \| \| \|_\|/ \| \| \| \| \|/\| \|
\| \| \| \| * \| \|	eclair snapshot	Jean-Baptiste Queru	2009-11-12	390	-25888/+87999
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	am fa461021: am 49dcc4de: Fix typo which prevented the computation of the ↵	David 'Digit' Turner	2009-10-29	1	-1/+1
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	default /data partition size from working properly. Merge commit 'fa4610215cef5d4ccff7357c62d332d4d93e0f13' into eclair-plus-aosp * commit 'fa4610215cef5d4ccff7357c62d332d4d93e0f13': Fix typo which prevented the computation of the default /data partition size
\| \| * \| \| \| \|	am 7d0891ef: am def0e542: Remove the disk partition size hardware properties.	David 'Digit' Turner	2009-10-29	4	-55/+4
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '7d0891efa38af61302b644a3c150fa6fa4367b42' into eclair-plus-aosp * commit '7d0891efa38af61302b644a3c150fa6fa4367b42': Remove the disk partition size hardware properties.
\| \| * \ \ \ \ \	am a1d61942: am dba3a6fd: (-s ours) Fix the -trace emulator option. (do not ↵	David 'Digit' Turner	2009-10-16	0	-0/+0
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merge) Merge commit 'a1d61942af9126b3525b1a91efed3b5b63c886cb' into eclair-plus-aosp * commit 'a1d61942af9126b3525b1a91efed3b5b63c886cb': Fix the -trace emulator option. (do not merge)
\| \| * \ \ \ \ \ \	am a577fcad: Fix the -trace emulator option.	David 'Digit' Turner	2009-10-16	5	-25/+63
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'a577fcadc0b365ee629aec313f57a65d54fe5d89' into eclair-plus-aosp * commit 'a577fcadc0b365ee629aec313f57a65d54fe5d89': Fix the -trace emulator option.
* \| \| \ \ \ \ \ \ \	am 786eceb4: am c95f75ae: am fa461021: am 49dcc4de: Fix typo which prevented ↵	David 'Digit' Turner	2009-10-29	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the computation of the default /data partition size from working properly. Merge commit '786eceb493bb9c27a53bdb6ab46b0ff0e5c87d52' * commit '786eceb493bb9c27a53bdb6ab46b0ff0e5c87d52': Fix typo which prevented the computation of the default /data partition size
\| * \| \| \| \| \| \| \| \|	am c95f75ae: am fa461021: am 49dcc4de: Fix typo which prevented the ↵	David 'Digit' Turner	2009-10-29	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	computation of the default /data partition size from working properly. Merge commit 'c95f75aebab035bb62b63cae426a1cca394f5a50' into eclair-mr2-plus-aosp * commit 'c95f75aebab035bb62b63cae426a1cca394f5a50': Fix typo which prevented the computation of the default /data partition size
\| \| * \| \| \| \| \| \| \|	am fa461021: am 49dcc4de: Fix typo which prevented the computation of the ↵	David 'Digit' Turner	2009-10-29	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	default /data partition size from working properly. Merge commit 'fa4610215cef5d4ccff7357c62d332d4d93e0f13' into eclair-mr2 * commit 'fa4610215cef5d4ccff7357c62d332d4d93e0f13': Fix typo which prevented the computation of the default /data partition size
\| \| \| * \| \| \| \| \| \|	am 49dcc4de: Fix typo which prevented the computation of the default /data ↵	David 'Digit' Turner	2009-10-29	1	-1/+1
\| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	partition size from working properly. Merge commit '49dcc4de79c93de65c20706b798353be1e840915' into eclair * commit '49dcc4de79c93de65c20706b798353be1e840915': Fix typo which prevented the computation of the default /data partition size
\| \| \| \| * \| \| \| \| \|	Fix typo which prevented the computation of the default /data partition size	David 'Digit' Turner	2009-10-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from working properly.
* \| \| \| \| \| \| \| \| \|	am feb37734: am 98f3c372: am 7d0891ef: am def0e542: Remove the disk ↵	David 'Digit' Turner	2009-10-29	4	-55/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	partition size hardware properties. Merge commit 'feb377343c836010839c09899215ae35eef64908' * commit 'feb377343c836010839c09899215ae35eef64908': Remove the disk partition size hardware properties.
\| * \| \| \| \| \| \| \| \|	am 98f3c372: am 7d0891ef: am def0e542: Remove the disk partition size ↵	David 'Digit' Turner	2009-10-29	4	-55/+4
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	hardware properties. Merge commit '98f3c372f1725ceffe9933bdf93b93c05a7c1bfa' into eclair-mr2-plus-aosp * commit '98f3c372f1725ceffe9933bdf93b93c05a7c1bfa': Remove the disk partition size hardware properties.
\| \| * \| \| \| \| \| \| \|	am 7d0891ef: am def0e542: Remove the disk partition size hardware properties.	David 'Digit' Turner	2009-10-29	4	-55/+4
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit '7d0891efa38af61302b644a3c150fa6fa4367b42' into eclair-mr2 * commit '7d0891efa38af61302b644a3c150fa6fa4367b42': Remove the disk partition size hardware properties.
\| \| \| * \| \| \| \| \| \|	am def0e542: Remove the disk partition size hardware properties.	David 'Digit' Turner	2009-10-29	4	-55/+4
\| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / \| \| \| \| \| \| \| / / / \| \| \| \| \|_\|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'def0e542c9cc004a7b83ff965103c34097c0960b' into eclair * commit 'def0e542c9cc004a7b83ff965103c34097c0960b': Remove the disk partition size hardware properties.
\| \| \| \| * \| \| \| \|	Remove the disk partition size hardware properties.	David 'Digit' Turner	2009-10-29	4	-55/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also remove the error/abort message in case an AVD's image files are larger than the default.
* \| \| \| \| \| \| \| \|	am 406ceb6b: (-s ours) am 5978ea5e: am a1d61942: (-s ours) am dba3a6fd: (-s ↵	David 'Digit' Turner	2009-10-16	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ours) Fix the -trace emulator option. (do not merge) Merge commit '406ceb6b1028e255991c80c122c628783b93980f' * commit '406ceb6b1028e255991c80c122c628783b93980f': Fix the -trace emulator option. (do not merge)
\| * \| \| \| \| \| \| \|	am 5978ea5e: am a1d61942: (-s ours) am dba3a6fd: (-s ours) Fix the -trace ↵	David 'Digit' Turner	2009-10-16	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	emulator option. (do not merge) Merge commit '5978ea5eba5fd0de206ae73f1e87b1b65479c0ae' into eclair-mr2-plus-aosp * commit '5978ea5eba5fd0de206ae73f1e87b1b65479c0ae': Fix the -trace emulator option. (do not merge)
\| \| * \| \| \| \| \| \|	am a1d61942: (-s ours) am dba3a6fd: (-s ours) Fix the -trace emulator ↵	David 'Digit' Turner	2009-10-16	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \| \| \| \| / / / \| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	option. (do not merge) Merge commit 'a1d61942af9126b3525b1a91efed3b5b63c886cb' into eclair-mr2 * commit 'a1d61942af9126b3525b1a91efed3b5b63c886cb': Fix the -trace emulator option. (do not merge)
\| \| \| * \| \| \| \|	am dba3a6fd: (-s ours) Fix the -trace emulator option. (do not merge)	David 'Digit' Turner	2009-10-16	0	-0/+0
\| \| \| \|\ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| _ / / / \| \| \| \| / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'dba3a6fdf7ec051143f0d889721f56b2e28803f3' into eclair * commit 'dba3a6fdf7ec051143f0d889721f56b2e28803f3': Fix the -trace emulator option. (do not merge)