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
Merge commit 'a295a3908befeb9dd30203c612d95411d68492ed'
* commit 'a295a3908befeb9dd30203c612d95411d68492ed':
Rename LargeBitmap to BitmapRegionDecoder for having a better API.
Merge commit 'a1205f07a6f0c745e8f42f16fe38c06af04143c7'
* commit 'a1205f07a6f0c745e8f42f16fe38c06af04143c7':
Modify native ALooper to take an explicit ident.
Change insertion point on tap is no longer handled by the CommitSelectionReceiver
(as it is not called by ExtractEditText).
Fixed a bug to handle drawing positions when the internal TextView scroller is used.
Change-Id: I87398c7109c5527d21dee6abbdb925848244d594
Merge commit 'd0f74ae081bac9a9c8f7faf9288305647735d743' into gingerbread-plus-aosp
* commit 'd0f74ae081bac9a9c8f7faf9288305647735d743':
Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE
Merge commit 'b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628' into gingerbread-plus-aosp
* commit 'b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628':
Rename LargeBitmap to BitmapRegionDecoder for having a better API.
Merge commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea' into gingerbread-plus-aosp
* commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea':
Modify native ALooper to take an explicit ident.
The ALooper API now uses an explicit "identifier" for the integer
that is returned rather than implicitly using the fd. This allows
the APIs that had the fd to be a little more sane.
Change-Id: I8507f535ad484c0bdc4a1bd016d87bb09acd7ff0
Merge commit '3f6e4d56bba393ac556a672202e00bc417784ce8'
* commit '3f6e4d56bba393ac556a672202e00bc417784ce8':
Don't fall through from TOKEN_EMAIL_LOOKUP
Merge commit 'b8bcfed5524a37ee51e3f1129f1df91bc4a59cb4'
* commit 'b8bcfed5524a37ee51e3f1129f1df91bc4a59cb4':
Add system property to turn off scheduling groups.
Merge commit '1cc86da61a361c84ef81e893440c500e33fae312' into gingerbread-plus-aosp
* commit '1cc86da61a361c84ef81e893440c500e33fae312':
Don't fall through from TOKEN_EMAIL_LOOKUP
Merge commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7' into gingerbread-plus-aosp
* commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7':
Add system property to turn off scheduling groups.
Merge commit 'b1104b3713febb75164938a465c3022e1879245f' into gingerbread-plus-aosp
* commit 'b1104b3713febb75164938a465c3022e1879245f':
Make SharedPreferencesBackupHelper wait for async SharedPreference writes
Merge commit '745e751b251baa38e94dfce1fe264574d0204cc2' into gingerbread-plus-aosp
* commit '745e751b251baa38e94dfce1fe264574d0204cc2':
Preserve old translations for changed strings. DO NOT MERGE
When a URL is malformed because the path does not start with a slash,
we assume that the path starts with the first character that is not
valid in the host and insert a leading slash. This is the reason why
the regex for the path component does not force a leading slash.
Bug: 1011602
Change-Id: I8efe46c058d2ee2d1a6a4406ee25dc021315222b
Merge commit 'f17bd19acbb88429b50a1497bfec0752b456d5c6'
* commit 'f17bd19acbb88429b50a1497bfec0752b456d5c6':
Use new nativeLibraryPath field for NativeActivity