Merge commit 'f2e67a5779d404b4791c6ab5b0d30dfb2c463514' into gingerbread-plus-aosp
* commit 'f2e67a5779d404b4791c6ab5b0d30dfb2c463514':
InputMethodService: Fix ignore case in showInputMethodPickerFromClient
Merge commit 'bc881e66d15181494fdd5d0ece83e20ef325453b' into gingerbread-plus-aosp
* commit 'bc881e66d15181494fdd5d0ece83e20ef325453b':
frameworks/base: Swap width and height of temporary buffer only with
Merge commit 'e37ab63221af94d69437741a3645fc0e14a680bc' into gingerbread-plus-aosp
* commit 'e37ab63221af94d69437741a3645fc0e14a680bc':
Fix build on some linux machines
Merge commit 'c4c4c98c5ca6b4c017a5b429a6bd80a440c63559' into gingerbread-plus-aosp
* commit 'c4c4c98c5ca6b4c017a5b429a6bd80a440c63559':
In CW Interrogation service class is not sent.
Merge commit '2725a6551261044318e42ccc9ebeabed7edf5ee7' into gingerbread-plus-aosp
* commit '2725a6551261044318e42ccc9ebeabed7edf5ee7':
Fix a bug in unregisterPhone().
Merge commit '091c5238a00ca51dc69b8b09459e6ac88e1eb077' into gingerbread-plus-aosp
* commit '091c5238a00ca51dc69b8b09459e6ac88e1eb077':
SipAudioCall: perform local ops before network op in endCall()
Merge commit 'fbb936bfab22cb1c3748cccffe67f42f7d764b54' into gingerbread-plus-aosp
* commit 'fbb936bfab22cb1c3748cccffe67f42f7d764b54':
Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
Merge commit '91a7f5fef8a9fc496acef23f513cb48139e8dff5' into gingerbread-plus-aosp
* commit '91a7f5fef8a9fc496acef23f513cb48139e8dff5':
Making sure that the prefix is handled properly.
orientation change
Current code swaps the width and height by assuming that aspect
ratio of the buffer width and height will be same as that of the
layout clip width and height. That is not always true.
Change the check to orientation change.
Change-Id: Ie387f3a7369025427484e4173cbde7a08df2b9d7
Merge commit 'd98d0fc6e9172d3f130794e499462c911920adf6' into gingerbread-plus-aosp
* commit 'd98d0fc6e9172d3f130794e499462c911920adf6':
Optimize VelocityTracker to run in linear time.
Merge commit '6061af11cb2b59b6261d12f98b9e8dd395ea8ba7' into gingerbread-plus-aosp
* commit '6061af11cb2b59b6261d12f98b9e8dd395ea8ba7':
Sort the IME list before showing to user
Merge commit '603a34ee30e7d14ddc02c1beb7bca915622ae4bf' into gingerbread-plus-aosp
* commit '603a34ee30e7d14ddc02c1beb7bca915622ae4bf':
improve a bit the implementation of eglGetProcAddress
Merge commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48' into gingerbread-plus-aosp
* commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48':
We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
Merge commit '605f402796afa9c88e2f91284e98d1f59a0726aa' into gingerbread-plus-aosp
* commit '605f402796afa9c88e2f91284e98d1f59a0726aa':
Import revised translations. DO NOT MERGE
Merge commit '235be391f3b9cd79e525de87757e361ae044940d' into gingerbread-plus-aosp
* commit '235be391f3b9cd79e525de87757e361ae044940d':
Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.
Merge commit '532d2ac5d5c06c3938c4999238d1051207bfe53c' into gingerbread-plus-aosp
* commit '532d2ac5d5c06c3938c4999238d1051207bfe53c':
Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
