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.
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:
Bug fix(1807910): media recorder crash due to the use of locked camera object (last part) - remove an unused Camera constructor - add a check on the argument in Camera::create() method
* changes:
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
