Merge commit '767741ffd5d14471b88791e5db93c08e8d2571eb'
* commit '767741ffd5d14471b88791e5db93c08e8d2571eb':
Making new Contacts APIs visible in Eclair SDK
Merge commit 'a5bfe52d9efb4d78edc48a64c2e85f8c4ecd4876' into eclair-mr2-plus-aosp
* commit 'a5bfe52d9efb4d78edc48a64c2e85f8c4ecd4876':
Make our choice of surface explicit.
Merge commit '0741c134645300fed9ad13760273c8d245a04e63' into eclair-mr2-plus-aosp
* commit '0741c134645300fed9ad13760273c8d245a04e63':
Making new Contacts APIs visible in Eclair SDK
Merge commit '6e144ad885f6cc3f090616a7ad4911d093049ad1' into eclair-plus-aosp
* commit '6e144ad885f6cc3f090616a7ad4911d093049ad1':
Making new Contacts APIs visible in Eclair SDK
Merge commit '6e144ad885f6cc3f090616a7ad4911d093049ad1' into eclair-mr2
* commit '6e144ad885f6cc3f090616a7ad4911d093049ad1':
Making new Contacts APIs visible in Eclair SDK
Merge commit '98a51b86869e9cf2a1624f8540c4c126962a3a85'
* commit '98a51b86869e9cf2a1624f8540c4c126962a3a85':
Allow multiple OpenGL contexts on systems that support them.
Merge commit 'eac70503c27104117f42de405cd5bd73579096be'
* commit 'eac70503c27104117f42de405cd5bd73579096be':
Framework-side DropBox service that maintains a size-bounded
Merge commit '3b7a1e6d70fda4ce834034930847fe2cc75de515' into eclair-mr2-plus-aosp
* commit '3b7a1e6d70fda4ce834034930847fe2cc75de515':
Allow multiple OpenGL contexts on systems that support them.
Merge commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625' into eclair-mr2-plus-aosp
* commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625':
Framework-side DropBox service that maintains a size-bounded
Merge commit '7fd752af7507e9f3d3e28f8e646f53f16373c02d'
* commit '7fd752af7507e9f3d3e28f8e646f53f16373c02d':
Prevent getFile from copying when the file is too large.
Merge commit 'bd6c80f689bc36523b935d84f9e5e563c2040f64' into eclair-mr2-plus-aosp
* commit 'bd6c80f689bc36523b935d84f9e5e563c2040f64':
Import revised translations. DO NOT MERGE
Merge commit 'b4b5f2af456acef83e69d4aa4b28b42a1859be7d'
* commit 'b4b5f2af456acef83e69d4aa4b28b42a1859be7d':
Enabling plugin surfaces to update their position in the UI.
Merge commit '34cc52922d4268633b3730dfd73658be6a06a2c5'
* commit '34cc52922d4268633b3730dfd73658be6a06a2c5':
Check cursor and URI value for nullity to prevent NPE.
Merge commit '00f166dedca88a781e7a64c07a42451a213f04ed'
* commit '00f166dedca88a781e7a64c07a42451a213f04ed':
Add a little logging to diagnose wifi cycle bug
Merge commit 'd6e86a687d57851b90d025ae33a8e4021bffe10d'
* commit 'd6e86a687d57851b90d025ae33a8e4021bffe10d':
Throttle camera preview frames to the app. Bug 2180302.
Merge commit '9550e2892f88194c9abbb85616bb55db67231d6e'
* commit '9550e2892f88194c9abbb85616bb55db67231d6e':
OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
Merge commit '4d915e00dcf40143f9caf89fd8eeadd32a8cb6f4'
* commit '4d915e00dcf40143f9caf89fd8eeadd32a8cb6f4':
Continue caching "POST" result so that we won't get
Merge commit 'c55bb59e542368500937d6737ce2ea2d3524d6d7'
* commit 'c55bb59e542368500937d6737ce2ea2d3524d6d7':
Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
Merge commit '4fce5c81d5b166920c60d4a907e581c71c215858'
* commit '4fce5c81d5b166920c60d4a907e581c71c215858':
Add the flag "FLAG_APPEND_TYPE_PARAM" to VCardConfig, which
Merge commit '74a2d09cba89db3b404aa10d89b5139f5ff6ab5d'
* commit '74a2d09cba89db3b404aa10d89b5139f5ff6ab5d':
Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
Merge commit '0b2dd95d2ead61241688a121ae1c6a5092149ef6'
* commit '0b2dd95d2ead61241688a121ae1c6a5092149ef6':
Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
Merge commit '8547ce6adaf218ea77c3062902f0cedf0347aa9c'
* commit '8547ce6adaf218ea77c3062902f0cedf0347aa9c':
add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
Merge commit '132570cbf4715fa13d237f1255848caf0dbd9d79'
* commit '132570cbf4715fa13d237f1255848caf0dbd9d79':
Delay 500ms between each registering each SDP record using sdptool.
