Merge commit 'edbb8083a815e9d911f8e659fc5c293543fdf502' into gingerbread-plus-aosp
* commit 'edbb8083a815e9d911f8e659fc5c293543fdf502':
add a fps counter to sanangeles demo
Merge commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7' into gingerbread-plus-aosp
* commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7':
HW audio encoder expects timestamp via kKeyTime from each input buffer
Merge commit '95d8648054223a501fe5390edef7e5d9383a4be8' into gingerbread-plus-aosp
* commit '95d8648054223a501fe5390edef7e5d9383a4be8':
Modify type of some environmental reverb parameters
Merge commit '9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8' into gingerbread-plus-aosp
* commit '9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8':
Force wallpaper surface to 565.
Merge commit '65634a7935ed6f173179e7ac91a05288693b2bbf' into gingerbread-plus-aosp
* commit '65634a7935ed6f173179e7ac91a05288693b2bbf':
Don't block in the BackupManagerService.dataChanged() Binder call.
Merge commit 'd9c80ab31ac3755141765e2c030bd1404ff0b050' into gingerbread-plus-aosp
* commit 'd9c80ab31ac3755141765e2c030bd1404ff0b050':
Fix for a memory leak in TextKeyListener.
Merge commit 'ee455f5a9572bc0d23c3328f6c22da91dc109a50' into gingerbread-plus-aosp
* commit 'ee455f5a9572bc0d23c3328f6c22da91dc109a50':
People holding partial wake locks now get blamed for CPU usage.
Merge commit '5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78' into gingerbread-plus-aosp
* commit '5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78':
Allow incoming SMS until internal storage is almost full.
Merge commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6' into gingerbread-plus-aosp
* commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6':
Add support for secure views.
Added the MotionEvent.FLAG_WINDOW_IS_OBSCURED flag which is set by the
input manager whenever another visible window is partly or wholly obscured
the target of a touch event so that applications can filter touches
accordingly.
Added a "filterTouchesWhenObscured" attribute to View which can be used to
enable filtering of touches when the view's window is obscured.
Change-Id: I936d9c85013fd2d77fb296a600528d30a29027d2
Merge commit 'c0b4f6d30d962d75125628317b5f5ea622531dfe' into gingerbread-plus-aosp
* commit 'c0b4f6d30d962d75125628317b5f5ea622531dfe':
Adds a time zone parameter to formatDateRange
Merge commit '468394fc6d1cb0c9078c2f98aa056860f7e0d743' into gingerbread-plus-aosp
* commit '468394fc6d1cb0c9078c2f98aa056860f7e0d743':
Text Selection: smart word detection. DO NOT MERGE.
Merge commit '669070787cc10377c2e5c3fa187babc728d96245' into gingerbread-plus-aosp
* commit '669070787cc10377c2e5c3fa187babc728d96245':
Fix the dialing from contact for internet address.
Merge commit '1b214be92ac206d8ac6ef4967db6e2859d91ab49' into gingerbread-plus-aosp
* commit '1b214be92ac206d8ac6ef4967db6e2859d91ab49':
Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."
Merge commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b' into gingerbread-plus-aosp
* commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b':
SipPhone: switch to its own phone type PHONE_TYPE_SIP.
Merge commit 'a19ef306bd0a257c67b50f5e0e669e9fe52b0889' into gingerbread-plus-aosp
* commit 'a19ef306bd0a257c67b50f5e0e669e9fe52b0889':
Revert "Free created FileMap when uncompressing files"
This reverts commit 52b8235238fb4d8cf141020cc1ae33880929dc3f.
munmap() on a region that overlaps something else (e.g, the ZIP Central
Directory in this case) unmaps those other regions as well making the
ZipFileRO class unhappy. Revert this for now until we can have FileMap
deal with this craziness.
Merge commit '883bbb72284736b5601f9e96d1116969c51b75de' into gingerbread-plus-aosp
* commit '883bbb72284736b5601f9e96d1116969c51b75de':
Hide mCursorController field in ArrowKeyMovementMethod.
Merge commit 'dbd25cdbc3dcad573aaeaf493bc186006bce3d8e' into gingerbread-plus-aosp
* commit 'dbd25cdbc3dcad573aaeaf493bc186006bce3d8e':
Made text selection work in ExtractEditText. DO NOT MERGE
