Merge commit 'af3289e4448971b38ae4e95269401452dbc6077e'
* commit 'af3289e4448971b38ae4e95269401452dbc6077e':
AI 147438: add app widget docs to dev guide
Merge commit '181634f0803d5d18ce48e811f697ea658852a95e'
* commit '181634f0803d5d18ce48e811f697ea658852a95e':
AI 147433: Fix broken link to sdk/samples dir in the offline.html page.
Merge commit 'd30605200b8b0f10e4740a9d7266d240023e69cd'
* commit 'd30605200b8b0f10e4740a9d7266d240023e69cd':
enable additional cdma sms fields and user data encodings
Merge commit '5f2788bc9d947f7793aaea06f7e21d6b74c98826'
* commit '5f2788bc9d947f7793aaea06f7e21d6b74c98826':
gps: Don't crash if no XTRA servers are specified.
Merge commit '98e333f551a4bf2ebb50bb97a2a56b14bfdcd74b'
* commit '98e333f551a4bf2ebb50bb97a2a56b14bfdcd74b':
Fix back key and ime behavior for search dialog.
Merge commit '4924ae8d1f7610b8639e55b1088f6b4a993bfd40'
* commit '4924ae8d1f7610b8639e55b1088f6b4a993bfd40':
Fixes#1816088. Avoid initializing empty Rects when they are useless, especially in Zygote.
Merge commit '6fcddb05eee19edfd3063b9eefbdb0de0dbd4f4f'
* commit '6fcddb05eee19edfd3063b9eefbdb0de0dbd4f4f':
Display the app icon to the left of the search field for search within apps.
Merge commit '77c9990ae0806575ae7a2750459f3e74f0bec092'
* commit '77c9990ae0806575ae7a2750459f3e74f0bec092':
Add call to (new) Canvas.freeCaches() in response to low-memory
Merge commit '79762a3ee34eb8be5549bcb183af844b6f19c266'
* commit '79762a3ee34eb8be5549bcb183af844b6f19c266':
location: Move DummyLocationProvider.java and LocationProviderImpl.java to the internal package.
Merge commit '7cb8ed23ab81b7cffdff6fc1cad473f55732ea66'
* commit '7cb8ed23ab81b7cffdff6fc1cad473f55732ea66':
location: Run LocationManagerService in a separate thread.
Merge commit '17f213bc528cf296e133e9ec9c9e0ce5dce41781'
* commit '17f213bc528cf296e133e9ec9c9e0ce5dce41781':
Bug fix(1807910): media recorder crash due to the use of locked camera object (last part)
Merge commit '04ab1c767199bc674a7b7424fdd0d527c32252ac'
* commit '04ab1c767199bc674a7b7424fdd0d527c32252ac':
Add a grey line to the top of the search plate image so it doesn't
Merge commit '3eab744d018924189b1b8f5530accd52e91213de'
* commit '3eab744d018924189b1b8f5530accd52e91213de':
Add support for changing a threads scheduler group. Three groups are available (default, background non interactive, foreground boost). Setting a thread priority to PRIORITY_BACKGROUND will transparently change groups to background
Merge commit '01be1fa7930e92aac6ba4dd4e8cb75f8719e8b37'
* commit '01be1fa7930e92aac6ba4dd4e8cb75f8719e8b37':
oops forgot to remove a LOGD when loading an opengl driver
Merge commit 'fd9b3c00fda65ac2ece0ab93454fdb61dff792cc'
* commit 'fd9b3c00fda65ac2ece0ab93454fdb61dff792cc':
Add file to ignore the content of the layoutlib/Bridge Eclipe bin folder.
Merge commit 'affb4e7694a4184d257d0ac71e3119e015b558e2'
* commit 'affb4e7694a4184d257d0ac71e3119e015b558e2':
Make sure to map undefined OES functions to their non-OES counterpart if it exists.
Merge commit 'ba2eba40fe24eca6af1563181ce07e4e006a4f5d'
* commit 'ba2eba40fe24eca6af1563181ce07e4e006a4f5d':
Modify and turn on the test case for video recording in portrait mode.
Merge commit 'd6f9b9babae9b8ebf1fee8c98135b17e42c577f2'
* commit 'd6f9b9babae9b8ebf1fee8c98135b17e42c577f2':
use gl.h to generate the *.in files. we are now supporting the full gl.h and glext.h apis.
* changes:
Vorbis render thread was nice 0, should be nice -16. Seems like a recent change sets the thread priority to 0. Previously it inherited priority from the parent thread. This change sets the Vorbis render thread priority to the default for audio threads. Reference bug 1800905
Merge commit '0a9b5bbb47a965238ca0e1e699d61d7ddd054742'
* commit '0a9b5bbb47a965238ca0e1e699d61d7ddd054742':
Fix a media server crash (bug 1807910): part one
Merge commit '24b62d0c41cf37ade751fe96a4888fbe7f61eb5a'
* commit '24b62d0c41cf37ade751fe96a4888fbe7f61eb5a':
integrate some OpenGL ES changes back from master_gl in preparation of opening GLES to the NDK.
* changes:
CheckedTextView is abstract but can be inflated from XML. Let's be consistent and allow it to be used from Java code as well by making it non-abstract.
* changes:
Fixes 1819406. Take a ListView, add headers/footers, set the adapter after at least one layout pass, and the headers/footers don't know they have a parent anymore. Which causes a lot of trouble, like drawing not happening.
