* changes:
AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
* changes:
sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.
Merge commit 'ba8e4d240b3d5eaebbdba9351b247ac20bedadc5' into eclair-mr2-plus-aosp
* commit 'ba8e4d240b3d5eaebbdba9351b247ac20bedadc5':
Add account name / type query parameters for calendar Events.
Merge commit 'b6ddc7ae3507f0e1ea9a76c76f829bc8b26a292c' into eclair-mr2-plus-aosp
* commit 'b6ddc7ae3507f0e1ea9a76c76f829bc8b26a292c':
Notify native plugin code when the browser discards the customView.
Merge commit 'a8eaaa1027e09daab01224cfe4a27b19570d35b0' into eclair-mr2-plus-aosp
* commit 'a8eaaa1027e09daab01224cfe4a27b19570d35b0':
Fix TabHost NPE when there are no tabs
Merge commit 'e30e85c7e6918129d73d332bb227b41abb5bdd47'
* commit 'e30e85c7e6918129d73d332bb227b41abb5bdd47':
Fix the dependencies to make online-sdk-docs.
Merge commit '6a6f43f577c6cb22202ee86fb3c6d1601f36c3b5'
* commit '6a6f43f577c6cb22202ee86fb3c6d1601f36c3b5':
Fix#2269582 Sometimes camera preview screen is truncated
Merge commit '092de0a989dc3e81a957938670fb147f34afaa36'
* commit '092de0a989dc3e81a957938670fb147f34afaa36':
Layoutlib: Add a constant for default density value.
Merge commit 'e7c1b11ec892fbb1eb053f9aa4f6839031b19c1c' into eclair-mr2-plus-aosp
* commit 'e7c1b11ec892fbb1eb053f9aa4f6839031b19c1c':
Fix the dependencies to make online-sdk-docs.
Merge commit '8091424ea332f754e6f1c712a9e28bfa7d02741e' into eclair-mr2-plus-aosp
* commit '8091424ea332f754e6f1c712a9e28bfa7d02741e':
Fix#2269582 Sometimes camera preview screen is truncated
Merge commit 'a7d461e09adf716c2148b45a5d94f5b8cb37f9ba' into eclair-mr2-plus-aosp
* commit 'a7d461e09adf716c2148b45a5d94f5b8cb37f9ba':
Layoutlib: Add a constant for default density value.
Merge commit '54bb575e85d1e40efbfbb868f37553cdd8ed318f' into eclair-mr2
* commit '54bb575e85d1e40efbfbb868f37553cdd8ed318f':
Fix the dependencies to make online-sdk-docs.
Merge commit '9b52a2184e99565bcd7f77effb321c95a2a4837e' into eclair-mr2
* commit '9b52a2184e99565bcd7f77effb321c95a2a4837e':
Fix#2269582 Sometimes camera preview screen is truncated
Merge commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7' into eclair-mr2
* commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7':
Layoutlib: Add a constant for default density value.
Merge commit '54bb575e85d1e40efbfbb868f37553cdd8ed318f' into eclair-plus-aosp
* commit '54bb575e85d1e40efbfbb868f37553cdd8ed318f':
Fix the dependencies to make online-sdk-docs.
Merge commit '6f95f461098d5b9e93212cf9cc7c7a6498eecf3a' into eclair
* commit '6f95f461098d5b9e93212cf9cc7c7a6498eecf3a':
Fix the dependencies to make online-sdk-docs.
Merge commit 'de0205f3bbda265cf8b53a912190dff86ab5d34e'
* commit 'de0205f3bbda265cf8b53a912190dff86ab5d34e':
Post a Runnable to execute setNewZoomScale when
Merge commit '70b942d34d1d1a30ab2d73bbefe214f5db0f4853' into eclair-mr2-plus-aosp
* commit '70b942d34d1d1a30ab2d73bbefe214f5db0f4853':
Post a Runnable to execute setNewZoomScale when
Merge commit '9b52a2184e99565bcd7f77effb321c95a2a4837e' into eclair-plus-aosp
* commit '9b52a2184e99565bcd7f77effb321c95a2a4837e':
Fix#2269582 Sometimes camera preview screen is truncated
Merge commit '28fdcf93bd4150299d1b7eda0c9bdcf4ae75069a'
* commit '28fdcf93bd4150299d1b7eda0c9bdcf4ae75069a':
Initial checkin of software AMR NB encoder based on PV source code.
Merge commit '089455760c05289c1315268a6cb896577ceebc64' into eclair-mr2-plus-aosp
* commit '089455760c05289c1315268a6cb896577ceebc64':
Initial checkin of software AMR NB encoder based on PV source code.
Merge commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7' into eclair-plus-aosp
* commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7':
Layoutlib: Add a constant for default density value.
Merge commit 'af1255dab8fa3eab1caf9bae799f80de14a74470' into eclair-mr2-plus-aosp
* commit 'af1255dab8fa3eab1caf9bae799f80de14a74470':
Fix#2320798: Device hang then runtime restart