Merge commit 'c3e7e5d37612279b792f45010df5569188af1ed5' into eclair-mr2-plus-aosp
* commit 'c3e7e5d37612279b792f45010df5569188af1ed5':
7 more ringtones. Now with more Dr. No!
Merge commit '720094bfaac28bb65cf9d5a0313f298dd8178f7f' into eclair-mr2-plus-aosp
* commit '720094bfaac28bb65cf9d5a0313f298dd8178f7f':
Another fix for #2186897: Cannot unlock the device by swiping
Merge commit '8c471d1def1027d025528b419cc8a1cdb68a4489' into eclair-mr2
* commit '8c471d1def1027d025528b419cc8a1cdb68a4489':
7 more ringtones. Now with more Dr. No!
Merge commit 'cbf77e9bef0db68c55b60994d93674bf6fd1ca13' into eclair-mr2
* commit 'cbf77e9bef0db68c55b60994d93674bf6fd1ca13':
Another fix for #2186897: Cannot unlock the device by swiping
Merge commit '398c24ecb50cafcce19f105f788fc311a430a8ff' into eclair-mr2-plus-aosp
* commit '398c24ecb50cafcce19f105f788fc311a430a8ff':
add hidden method to draw entire page into a canvas, with no view-chrome. For testing.
Merge commit '126ac7f9f957c6be35d6d43f8dee1d5ee7139f95' into eclair-mr2-plus-aosp
* commit '126ac7f9f957c6be35d6d43f8dee1d5ee7139f95':
Fix issue #2186709: Can't unlock the device for a while
Merge commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11' into eclair-mr2
* commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11':
Fix issue #2186709: Can't unlock the device for a while
Merge commit 'a5bfe52d9efb4d78edc48a64c2e85f8c4ecd4876' into eclair-mr2-plus-aosp
* commit 'a5bfe52d9efb4d78edc48a64c2e85f8c4ecd4876':
Make our choice of surface explicit.
Merge commit '0741c134645300fed9ad13760273c8d245a04e63' into eclair-mr2-plus-aosp
* commit '0741c134645300fed9ad13760273c8d245a04e63':
Making new Contacts APIs visible in Eclair SDK
Merge commit '6e144ad885f6cc3f090616a7ad4911d093049ad1' into eclair-mr2
* commit '6e144ad885f6cc3f090616a7ad4911d093049ad1':
Making new Contacts APIs visible in Eclair SDK
Merge commit '3b7a1e6d70fda4ce834034930847fe2cc75de515' into eclair-mr2-plus-aosp
* commit '3b7a1e6d70fda4ce834034930847fe2cc75de515':
Allow multiple OpenGL contexts on systems that support them.
Merge commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625' into eclair-mr2-plus-aosp
* commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625':
Framework-side DropBox service that maintains a size-bounded
queue of data chunks (sort of a blob-oriented logcat).
In the future, this will be coupled with a revised checkin service that
would actually upload this data.
Merge commit 'bd6c80f689bc36523b935d84f9e5e563c2040f64' into eclair-mr2-plus-aosp
* commit 'bd6c80f689bc36523b935d84f9e5e563c2040f64':
Import revised translations. DO NOT MERGE
Merge commit '770d5c4f0093a65d20b22f14082911697f9f9b9e' into eclair-mr2-plus-aosp
* commit '770d5c4f0093a65d20b22f14082911697f9f9b9e':
Futher reduce the logging of EriManager.
Merge commit '64d54042ff5c2c736a65f200296dbc3bceaa9029' into eclair-mr2
* commit '64d54042ff5c2c736a65f200296dbc3bceaa9029':
Futher reduce the logging of EriManager.
Adds a "junk path" option to aapt so that you can do:
aapt add -k archive.zip path/to/some.file
and have the file stored in the zip under the name "some.file"
(without the path). Needed so that we can use 'aapt add' in place of
'zip -j' when building jar files, which will lead to smaller
incremental OTAs.
