* changes:
MTP: Implement extra object properties for audio, video and image files
MediaStore: Add helper method to create Uri for querying genre for an audio file
Merge commit 'bf47092e1e76224474745b6919febd3aa9df5bcf' into gingerbread-plus-aosp
* commit 'bf47092e1e76224474745b6919febd3aa9df5bcf':
Fix track duration calculation if the start timestamp is non-zero
Merge commit 'fa5c8fc4a48fab5c5c612bd4eed6ea9c568f6afc'
* commit 'fa5c8fc4a48fab5c5c612bd4eed6ea9c568f6afc':
Support other kinds of HTTP redirect in NuHTTPDataSource
Merge commit 'abaabb2c7994e5a5026c2e2bd860d7f21eed0451' into gingerbread-plus-aosp
* commit 'abaabb2c7994e5a5026c2e2bd860d7f21eed0451':
Support other kinds of HTTP redirect in NuHTTPDataSource
Merge commit '4a04a3129bd30a996dd302b982aeca8f228f57e8'
* commit '4a04a3129bd30a996dd302b982aeca8f228f57e8':
Fix the unhold issue especially if one is behind NAT.
Merge commit 'bd2294204e3edaede3fe81eb9b11c05c4fafe627' into gingerbread-plus-aosp
* commit 'bd2294204e3edaede3fe81eb9b11c05c4fafe627':
Fix the unhold issue especially if one is behind NAT.
Merge commit '9627847d588cd969f60dcc79d165209184a90069' into gingerbread-plus-aosp
* commit '9627847d588cd969f60dcc79d165209184a90069':
Fix error in AudioEffect command status reporting.
Merge commit '465618ed567c418442890fcf91b6ee361b22b88b' into gingerbread-plus-aosp
* commit '465618ed567c418442890fcf91b6ee361b22b88b':
Use buffered output during packages.xml write
this captures the framebuffer via surfaceflinger APIs and outputs
it to stdout. this is intended to be used by adbd.
Change-Id: I0cfa6a47ec121edcd93f46b64870f9a553f653ff
Merge commit '560ba6e1a9dbd8a57fdee2040185981162ed09d6'
* commit '560ba6e1a9dbd8a57fdee2040185981162ed09d6':
DO NOT MERGE. Only 1 edge glow should be growing at a time.
Merge commit '08c09b0f84b23627b4cd02e1b9a642952fbd2e7f' into gingerbread-plus-aosp
* commit '08c09b0f84b23627b4cd02e1b9a642952fbd2e7f':
DO NOT MERGE. Only 1 edge glow should be growing at a time.
When a user action starts a new edge glow (on pull or absorb), cause
the edge glow on the opposite side to decay.
Fixes b/ star 3028395 Yellow color bar is displayed when user reaches the end of the message and keeps scrolling in Gmail.
Change-Id: Id06e00d1843b0467f6f9149c22b233e639fc55ac
Merge commit 'dafad06e7fba5ea3dea43aebe16d5a34c34af426'
* commit 'dafad06e7fba5ea3dea43aebe16d5a34c34af426':
Add an option to hide the Voice Search icon.
Add BT test instrumentation for reboot tests.
DO NOT MERGE Separate utility methods into utility class.
Improve logging and flexibility of BT stress tests.
Remove @LargeTest annotations
Checkin initial bluetooth stress tests.
Change CDMAPhone.getDeviceId to return MEID or ESN.
Make the default backup configuration "disabled; local transport selected"
make android_id random seed depend on time as well as ro.serialno
Continue trying to make the turn off quickly after call feature work.
Merge commit '9035e206b3700928bc268b7c1ece34506e0a4f28' into gingerbread-plus-aosp
* commit '9035e206b3700928bc268b7c1ece34506e0a4f28':
Add an option to hide the Voice Search icon.
Add BT test instrumentation for reboot tests.
DO NOT MERGE Separate utility methods into utility class.
Improve logging and flexibility of BT stress tests.
Remove @LargeTest annotations
Checkin initial bluetooth stress tests.
Change CDMAPhone.getDeviceId to return MEID or ESN.
Make the default backup configuration "disabled; local transport selected"
make android_id random seed depend on time as well as ro.serialno
Continue trying to make the turn off quickly after call feature work.
Since the UI uses multi-touch for zooming, the event is passed to webkit
only when the webpage doesn't allow zooming.
1. Updated the data structure TouchEventData in WebViewCore.java
to take multiple points and used it everywhere.
2. Added a passMultiTouchToWebkit() function to do what its name means.
3. Added the multi-point touch support to dumprendertree.
Change-Id: Iafc1aa7b21a587ad26efd2f124b9a66316297ab8
