Merge commit 'e31724050041b4be41b7c868d531a6c00fd94587' into kraken
* commit 'e31724050041b4be41b7c868d531a6c00fd94587':
Make vCard allow users to refrain image export. Useful when
Merge commit 'c86f0779d6aa60d7eb446fb33742dac6bfc3b6b8' into froyo-plus-aosp
* commit 'c86f0779d6aa60d7eb446fb33742dac6bfc3b6b8':
Make vCard allow users to refrain image export. Useful when
Merge commit '8831d4dc5545cde841a0ef318b0ec870acfa0e45' into kraken
* commit '8831d4dc5545cde841a0ef318b0ec870acfa0e45':
Update the comment which supposed to be checked in
Merge commit '8f655cb6c836380778545fb13044d97ef57139d6' into froyo-plus-aosp
* commit '8f655cb6c836380778545fb13044d97ef57139d6':
Update the comment which supposed to be checked in
Merge commit 'e3ce4c89cc54770f01294adc3c3f052c062098c7' into kraken
* commit 'e3ce4c89cc54770f01294adc3c3f052c062098c7':
Remove fixed size restriction on the SurfaceView
Merge commit '2dc784988aa1660d02b50ed4e7d7679ba14b25b4' into froyo-plus-aosp
* commit '2dc784988aa1660d02b50ed4e7d7679ba14b25b4':
Remove fixed size restriction on the SurfaceView
Merge commit 'f57f147bfd5d6f7530a938d2e05fc7d68f7343c3' into kraken
* commit 'f57f147bfd5d6f7530a938d2e05fc7d68f7343c3':
add droiddoc flag to include since-tags for api level 8
Merge commit '5ce309d32e9aa28af4d2a6523ba2a4bc8e6d2f53' into froyo-plus-aosp
* commit '5ce309d32e9aa28af4d2a6523ba2a4bc8e6d2f53':
add droiddoc flag to include since-tags for api level 8
Merge commit '66fa5cc73dd20e8656c478e95f07798d8e20b44a' into kraken
* commit '66fa5cc73dd20e8656c478e95f07798d8e20b44a':
Force redraw in touch_up if there is a move.
Merge commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67' into froyo-plus-aosp
* commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67':
Force redraw in touch_up if there is a move.
Merge commit '9a9b09f6bd209f9f46370c63cb72ab3460216b3b' into kraken
* commit '9a9b09f6bd209f9f46370c63cb72ab3460216b3b':
Ease contention on the mProcessStatsThread mutex in updateCpuStats.
Merge commit 'afbf9f8d6d66a0c1ba8c44a87b120bcad89ad8b5' into froyo-plus-aosp
* commit 'afbf9f8d6d66a0c1ba8c44a87b120bcad89ad8b5':
Ease contention on the mProcessStatsThread mutex in updateCpuStats.
Merge commit 'e77bba8f2b67508fc6d4aa7b0054829c2d49965a' into kraken
* commit 'e77bba8f2b67508fc6d4aa7b0054829c2d49965a':
Reset notification state on wifi enable
Merge commit '1892013643537f5fc330f5b0a02a0e9cb08b1134' into froyo-plus-aosp
* commit '1892013643537f5fc330f5b0a02a0e9cb08b1134':
Reset notification state on wifi enable
Merge commit '6aa2accae3f58e4139f890f51c699901ee3abb88' into kraken
* commit '6aa2accae3f58e4139f890f51c699901ee3abb88':
Fix bug 2599698 Music paused by itself
Merge commit '04152f98ffbd17f54a6b771636ff7f440f0edc78' into froyo-plus-aosp
* commit '04152f98ffbd17f54a6b771636ff7f440f0edc78':
Fix bug 2599698 Music paused by itself
Merge commit 'daa107c81db31b7fbaaf4219b0552ff07d44a29e' into kraken
* commit 'daa107c81db31b7fbaaf4219b0552ff07d44a29e':
Fix inconsistency in how we handle light sensor when battery is low.
Merge commit '3110bf6df1cb6d548e678cdcbb8c7349b2ac0d8a' into froyo-plus-aosp
* commit '3110bf6df1cb6d548e678cdcbb8c7349b2ac0d8a':
Fix inconsistency in how we handle light sensor when battery is low.