Merge commit 'ef54fe9aaab4124e61850062d2212b20c20c8ea5' into eclair-plus-aosp
* commit 'ef54fe9aaab4124e61850062d2212b20c20c8ea5':
Fix compilation error by declaring stride before the first goto
Merge commit 'a8ba4a0e361b44dd5edf954a8b088b310023eb3b' into eclair-plus-aosp
* commit 'a8ba4a0e361b44dd5edf954a8b088b310023eb3b':
Add the tool etc1tool to the sdk.
Merge commit '84d83ba81b076cc6234e3fc92b8367b89fab5561' into eclair-plus-aosp
* commit '84d83ba81b076cc6234e3fc92b8367b89fab5561':
DO NOT MERGE Tool for compressing/decompressing ETC1 textures.
Merge commit '7e3d678570d9e9849a249476275fec0a4bb1be1e' into eclair-plus-aosp
* commit '7e3d678570d9e9849a249476275fec0a4bb1be1e':
Fixes bug of the number of injected monkey events.
The ETC1 texture format is commonly supported by
OpenGL ES 2.0-capable GPUs.
For historical reasons ETC1 texture files have the
default extension .PKM
This tool relies on the libETC1 library to
compress and decompress the image data.
Merge commit '9c7692aabbf28554810f440fc7ff60fc9c335dc9' into eclair-plus-aosp
* commit '9c7692aabbf28554810f440fc7ff60fc9c335dc9':
Set ro.monkey if it's not set yet.
Merge commit '48f0d8993b5e871dd2695e983266aa655801769e' into eclair-plus-aosp
* commit '48f0d8993b5e871dd2695e983266aa655801769e':
Annouce that Monkey is running.
Merge commit '1d15167865b22730cf6ba314a057e62f960aa1db' into eclair-plus-aosp
* commit '1d15167865b22730cf6ba314a057e62f960aa1db':
sdk doc change for esr: fix some broken links to resources files.
Merge commit 'b84cf9e1e378f6cc6642b4ac3f391a85b208a23b' into eclair-plus-aosp
* commit 'b84cf9e1e378f6cc6642b4ac3f391a85b208a23b':
Clean up the SDK and make it compiled and installed in the SDK system image.
Merge commit '1162372c9e7ff4b6e60d247fb057b47f571af86f' into eclair-plus-aosp
* commit '1162372c9e7ff4b6e60d247fb057b47f571af86f':
Use the feature list for the SDK.
Merge commit '7579e4afcff771ed7e137b46bd019acd581c9568' into eclair-plus-aosp
* commit '7579e4afcff771ed7e137b46bd019acd581c9568':
Add new samples to the SDK.
Merge commit 'e7e7a6b821367c5c2ce7a0eac66f92a2689c22e9' into eclair-plus-aosp
* commit 'e7e7a6b821367c5c2ce7a0eac66f92a2689c22e9':
Modify index pages of MultiResolution, Wiktionary, and WiktionarySimple samples, to point to new screenshots. Also some minor cleanup.
Merge commit '1fd97693dc03fac4e189e5361a7ac7ee033caff2' into eclair-plus-aosp
* commit '1fd97693dc03fac4e189e5361a7ac7ee033caff2':
Update documentation to indicate EGL ES 2.0 isn't supported in the emulator.
Original code by Jeffrey Sharkey <jsharkey@android.com>.
Modifications:
- Remove .classpath, .project, and default.properties.
- Remove generated files (/gen).
- Create Android.mk and _index.html.
- Cleaned up whitespace and converted to match AOSP style guide.
- Renamed SimpleWiktionary to WiktionarySimple to keep both samples next to each other in the
directory listing.
- Removed the android:text attribute in the BulletPoint due to localization issues.
Merge commit 'bba4ff7c38e7e6837fabdb225cdb24d12a17eabc' into eclair-plus-aosp
* commit 'bba4ff7c38e7e6837fabdb225cdb24d12a17eabc':
Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to
Merge commit '6b4bd26058d9d4d920e6a26c14a8f8bda9a863a3' into eclair-plus-aosp
* commit '6b4bd26058d9d4d920e6a26c14a8f8bda9a863a3':
change the way bytes are read from InputStream.
* changes:
change the way bytes are read from InputStream. Read only the bytes received and don't allocate new arrays Also revise the mechanism for writing the outgoing messages to the screen to be more consistent with reading and cleanup line lengths to be <100 chars.
Read only the bytes received and don't allocate new arrays
Also revise the mechanism for writing the outgoing messages
to the screen to be more consistent with reading and
cleanup line lengths to be <100 chars.
