Merge commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d' into eclair-plus-aosp
* commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d':
Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Binary XML file line #37: Error inflating class <unknown> after adding a secondary account
Now that I have these debug logs, I want to keep them since they will make
debugging these kinds of issues a lot easier in the future. (Note in this
case there was no problem in the framework.)
Change-Id: If2b0bbeda4706b7c5dc1ba4a5db04b74f40e1543
Merge commit '633177cbdc21b9e8f2153069965fb6aa30b8cb8f' into eclair-plus-aosp
* commit '633177cbdc21b9e8f2153069965fb6aa30b8cb8f':
Move updated 6.xml from eclair-sholes-release into eclair
Merge commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24' into eclair-plus-aosp
* commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24':
Add the checking for mediaplayer stress test.
Merge commit '2a6a149fc2abfb8ef654ed36ce4524209f5e33bc' into eclair-plus-aosp
* commit '2a6a149fc2abfb8ef654ed36ce4524209f5e33bc':
docs change for ESD: add samples html pages for offline docs
Merge commit 'e16113998bb10f39ee1384bfc497aceeeb193440' into eclair-plus-aosp
* commit 'e16113998bb10f39ee1384bfc497aceeeb193440':
docs for ESR: add docs to bluetooth explainin that discovery should
Merge commit '820a4e7dd6adeff162a92ca40ebe2f109561036b' into eclair
* commit '820a4e7dd6adeff162a92ca40ebe2f109561036b':
docs change for ESD: add samples html pages for offline docs
Merge commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc' into eclair
* commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc':
docs for ESR: add docs to bluetooth explainin that discovery should
Merge commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870' into eclair-plus-aosp
* commit '57bda83d105a1fc3c4c0ccb6cb743e6ba7c98870':
Add a test app that has 100 icons. None of them do anything when clicked.
Merge commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a' into eclair-plus-aosp
* commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a':
backout a workaround that is not needed anymore
Merge commit '74a331b5dd1d39da44b608743c36ab3523f598d2' into eclair-plus-aosp
* commit '74a331b5dd1d39da44b608743c36ab3523f598d2':
fix [2269022] The raw picture displayed post shutter seems to have low-resolution
Merge commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4' into eclair-plus-aosp
* commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4':
DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
* changes:
DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
Merge commit '5994cd2898ad3c76d1f5068137a884024f521163' into eclair-plus-aosp
* commit '5994cd2898ad3c76d1f5068137a884024f521163':
-hide AccountManagerResponse, which never should have been exposed in the first place
* changes:
Fix bug 2271468 Update the javadoc for MediaRecorder.AudioSource to define how the two new audio sources behave when used on devices that don't support them.
* changes:
docs: misc edits to samples page and intro docs make samples page accessible from offline version instead of redirecting to the user filesystem and include instructions for creating projects based on the sample apps. fix a link and add some content to the What is android doc.
Merge commit '30142f7ef7bf3d4699526cb9ce02b220a8045c5d' into eclair-plus-aosp
* commit '30142f7ef7bf3d4699526cb9ce02b220a8045c5d':
Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
Merge commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d' into eclair-plus-aosp
* commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d':
Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
