Merge commit 'ecae28bc3ea9e68b7b4f1b5879a52f46b9bbc33c'
* commit 'ecae28bc3ea9e68b7b4f1b5879a52f46b9bbc33c':
Added code style fix that actually did not get submitted in 2nd patch of previous change.
Merge commit 'fee73ee2d6eb3e875e39a64c410d6a1ff8508ad3' into eclair-plus-aosp
* commit 'fee73ee2d6eb3e875e39a64c410d6a1ff8508ad3':
Cache inflated view to avoid inflation of layouts in preferences
Merge commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5' into eclair-plus-aosp
* commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5':
Added code style fix that actually did not get submitted in 2nd patch of previous change.
Merge commit '858089557514424175a4bd9c89276dca1f92b95d'
* commit '858089557514424175a4bd9c89276dca1f92b95d':
WebView may get message after destroy() is called.
Merge commit '14e8e988cfdd01b665f5b49fb6f95a6c11ce3660'
* commit '14e8e988cfdd01b665f5b49fb6f95a6c11ce3660':
Always consider m4a files as audio, even when they contain a video track.
* changes:
Cache inflated view to avoid inflation of layouts in preferences If layout id is specified for a Preference object, convertView is set to null in its adapter which results in inflation of Preference view in getView each time the Preference object is laid out on the screen. Just use an instance variable to cache the inflated view nulling it whenever the layout changes and use it in initing the convertView in getView.
Merge commit '12482deafbe520ed9e88691e0caaa6f5e0e49519'
* commit '12482deafbe520ed9e88691e0caaa6f5e0e49519':
Updated status bar graphics (drop date 9/25/09).
Merge commit 'c87c76f6fc6deeb6a0fbbcbb345bfa5e6b6dc435'
* commit 'c87c76f6fc6deeb6a0fbbcbb345bfa5e6b6dc435':
don't emit GL commands when sf is in freeze mode
Merge commit '8e8ee1fd722f6f0af818e31c7bcaa0eece125ded'
* commit '8e8ee1fd722f6f0af818e31c7bcaa0eece125ded':
Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose.
Merge commit 'aa507136493b24a899b270367b08a7158085c9b8'
* commit 'aa507136493b24a899b270367b08a7158085c9b8':
Check that playlist entries refer to a row in the audio table.
Merge commit '216638a0357e8f3abf452c4bd073d8ee2cdb4bb0'
* commit '216638a0357e8f3abf452c4bd073d8ee2cdb4bb0':
Add documentation about flash and change video-light to torch.
Merge commit '9da48f26028b61e3b757775f54a05293b9dca798'
* commit '9da48f26028b61e3b757775f54a05293b9dca798':
Allways dump the list of allocated buffers when an allocation fails.
Merge commit '7a5917d5db3f9d9f3145e7be9c95a2533d35308e'
* commit '7a5917d5db3f9d9f3145e7be9c95a2533d35308e':
Improve logging code to dump more detaild rs object info. Fix bug with predefined elements not being recreated for contexts after one was destroyed. Add stricter type enforcement.
Merge commit 'd155f6d79251ecc1f27e079e9ac05d7855dda505'
* commit 'd155f6d79251ecc1f27e079e9ac05d7855dda505':
Modified the test case name for the browser page load test.
Merge commit 'dd205d14468b532395a2d9896dd550150f09cc23'
* commit 'dd205d14468b532395a2d9896dd550150f09cc23':
Don't forget to clear "backup in progress" state when finishing a pass
Merge commit '207308a781621c427acccbd9983c2511a65e9137' into eclair-plus-aosp
* commit '207308a781621c427acccbd9983c2511a65e9137':
WebView may get message after destroy() is called.
Merge commit '7d9735142f75c3bf30b420fdd006dc356f32fede' into eclair-plus-aosp
* commit '7d9735142f75c3bf30b420fdd006dc356f32fede':
Always consider m4a files as audio, even when they contain a video track.
Merge commit 'c18b0ebcfb905cc5001618c78890e884a859e069' into eclair-plus-aosp
* commit 'c18b0ebcfb905cc5001618c78890e884a859e069':
Add checks for double-dumping on webkit data.
* Microsoft Office common extensions
* .xml -> text/xml
* Change existing mapping of ".pot"->"text/plain" to ".po"
Note: We already had a definition for .pot to text/plain. Per the
information found at <http://www.fileinfo.com/extension/pot> this is the
rarely seen "portable object file", and is often named ".po" to avoid
this same conflict.
Addresses bug # 2097457
Change-Id: I964b853fdeae77d742f627c535a8b32e0e53516a
Also some logs seem to suggest that in rare occations, a webkit dump after timeout has occured actually never hears any response back from webkit, thus causing the test app to wait forever, because the request webkit data mechanism is not protected by a timeout watchdog. So adding a explicit log print before calling webkit dump for monitoring in future test runs.
Merge commit 'b19774d520bde5bb12d80417788d9a773e123c14' into eclair-plus-aosp
* commit 'b19774d520bde5bb12d80417788d9a773e123c14':
Updated status bar graphics (drop date 9/25/09).
Merge commit '98b050d067037bd25ac81b75d46bf030c6d73b9e'
* commit '98b050d067037bd25ac81b75d46bf030c6d73b9e':
add new column "real_date" for IM messages table.
Merge commit '7df612ceb9edd01808cd74bd460a55b548df8010'
* commit '7df612ceb9edd01808cd74bd460a55b548df8010':
bug 2148061: if PduBody is zero length, treat it as an empty message.
Merge commit 'a1414d1c5bd2c91571e83fb147c17996ec170555'
* commit 'a1414d1c5bd2c91571e83fb147c17996ec170555':
Fix issue #2148939: Sholes slow to wake up in landscape mode
Merge commit '528961a61d99280e67fbb13b78b3d2538c3025d5'
* commit '528961a61d99280e67fbb13b78b3d2538c3025d5':
Handle expiration of discovery mode in system server.
Merge commit '1ff3d1f0a2ce0843971106ab47823fafabfc1055'
* commit '1ff3d1f0a2ce0843971106ab47823fafabfc1055':
When change from narrow screen to wide screen, we will
Merge commit 'c46f886b63772be33c6e6864475140606a79e126'
* commit 'c46f886b63772be33c6e6864475140606a79e126':
Only scan windows media files when those codecs are enabled.
Merge commit '6a1f43990350421e7a41255dbcbfdf0b86e9b92c'
* commit '6a1f43990350421e7a41255dbcbfdf0b86e9b92c':
Add official assets for tabs in compatibility mode
