Merge commit 'b5c05516ba2c341655d54f17bdd17a5ab2d173df' into eclair-plus-aosp
* commit 'b5c05516ba2c341655d54f17bdd17a5ab2d173df':
Copy the selection args when creating a CPO since callers often reuse the passed in array.
Merge commit '5de6389f2252cb6e39918e21f80a08918e0c2c02' into eclair-mr2-plus-aosp
* commit '5de6389f2252cb6e39918e21f80a08918e0c2c02':
DO NOT MERGE. Send a message when the picture changes and find is up to search again.
Merge commit '33728557540d9033ff396f7a2ddd4fb304fdedcd'
* commit '33728557540d9033ff396f7a2ddd4fb304fdedcd':
Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
Merge commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff'
* commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff':
Instead of a raw AIDL interface, give DropBox a Java
Merge commit '40946aa20183984fd60f2dbdc7708cf1c5431047' into eclair-mr2-plus-aosp
* commit '40946aa20183984fd60f2dbdc7708cf1c5431047':
Add SDK version for MR1.
Merge commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e' into eclair-plus-aosp
* commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e':
When upgrading packages with shared user ids make sure we are eliminating
the package about to be deleted or upgraded when updating permissions associated
with the shared user. Include a simple null check when retrieving the permission.
Fix PackageParser to avoid ArrayIndexOutOfBounds exceptions in several places
Merge commit 'e1cba3dbad30286c5c3006e0b9c1226ef72ad8e4'
* commit 'e1cba3dbad30286c5c3006e0b9c1226ef72ad8e4':
Add Authentication Type field to the APN settings.
Merge commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b' into eclair-mr2-plus-aosp
* commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b':
Fix test breakage in testNickNameV21().
Merge commit 'd95a02c2a652ffe35dcc0336a3e35d91b1027d54' into eclair-mr2-plus-aosp
* commit 'd95a02c2a652ffe35dcc0336a3e35d91b1027d54':
Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
Merge commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0' into eclair-mr2-plus-aosp
* commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0':
Add partial support of Android-specific properties.
Merge commit '952402704a175ba27f6c89dff1ada634c5ce5626' into eclair-mr2-plus-aosp
* commit '952402704a175ba27f6c89dff1ada634c5ce5626':
Instead of a raw AIDL interface, give DropBox a Java
In the near future, all the values which cannot be converted to
vCard property is expressed as "X-ANDROID-CUSTOM" property + MIME_TYPE.
Example (Nick name):
X-ANDROID-CUSTOM:vnd.android.cursor.item/nickname;Nicky;;;;;;;;;;;;;
All the data are stored ordered by its column name ("data1" - "data15").
Currently the code assumes the max num is 15.
Internal Issue number: 2079082
Merge commit '31957f1badbb900bbfe211317e1ea992d650a72d' into eclair-plus-aosp
* commit '31957f1badbb900bbfe211317e1ea992d650a72d':
- add javadoc for the account manager
interface (android.os.DropBox); move the Binder interface
behind the scenes. Make DropBoxEntry into DropBox.Entry.
Make it possible to get a dropbox from an (Application)Context
with the usual getSystemService(DROPBOX_SERVICE) type thing.
Update the tests accordingly.
Merge commit '5e5eb393729630800079206498f283de8f02f3a7' into eclair-plus-aosp
* commit '5e5eb393729630800079206498f283de8f02f3a7':
don't throw an exception when we can't find a pending sync operation in the database
- Added new functions to PerformanceCollector and PerformanceResultsWriter
- Modified unit tests to test new functionality and fix flakiness reported in
2218327 and 2118268
- Added PerformanceCollectorTest to small suite
Merge commit '4ac5066d53b40ec59a1f30ca11b8d5e1ba25659d' into eclair-mr2-plus-aosp
* commit '4ac5066d53b40ec59a1f30ca11b8d5e1ba25659d':
Disambiguation between multiple pointers and swipe gestures.
DOCS ONLY
The code example for android.os.Parcelable contained several errors:
- There was no type parameter for Parcelable.Creator (due to unescaped
< > in the javadoc comment).
- There was no implementation of describeContents().
- The semicolon after the CREATOR declaration was missing.
This change fixes all of the above.
Fixes issue http://b/issue?id=2221120
Change-Id: Icaf932d079573cc7699f1caa643aac49e85ccca0
Merge commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d' into eclair-mr2
* commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d':
Disambiguation between multiple pointers and swipe gestures.
Merge commit '9fa7048ca3a7b5184ce761bbf908c512d524b9e2' into eclair-mr2-plus-aosp
* commit '9fa7048ca3a7b5184ce761bbf908c512d524b9e2':
Add Authentication Type field to the APN settings.
Merge commit '6158038a09069bc178970160d4b3667573bfc655' into eclair-mr2
* commit '6158038a09069bc178970160d4b3667573bfc655':
Add Authentication Type field to the APN settings.
Merge commit '6ba3ef31fd4672df3fb886ff458329d0d15b8456'
* commit '6ba3ef31fd4672df3fb886ff458329d0d15b8456':
Many fixes to text input in the browser, particularly when moving to a new field.
Merge commit 'bb107bd6f7981cd2b2e31a0afc6f6bf2a6d5118f' into eclair-mr2-plus-aosp
* commit 'bb107bd6f7981cd2b2e31a0afc6f6bf2a6d5118f':
Many fixes to text input in the browser, particularly when moving to a new field.
Merge commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441' into eclair-plus-aosp
* commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441':
Add SDK version for MR1.
