Merge commit 'c4bbb9144d1955340d69548e7245417cbe862d3c'
* commit 'c4bbb9144d1955340d69548e7245417cbe862d3c':
Rename the term "attribute"/"attr" to "parameter"/param".
Merge commit '6cb76ac37f1b4a36d81db7d7e8652d82b6f1b8b5' into eclair-mr2-plus-aosp
* commit '6cb76ac37f1b4a36d81db7d7e8652d82b6f1b8b5':
Rename the term "attribute"/"attr" to "parameter"/param".
We had been using "parameter"/"param" by mistake, while both vCard
formats uses theterm "attribute"/"attr". This is confusing.
Internal issue number: 2233884
Merge commit '0d8aa05d306205850e3014550bce34735ac78660'
* commit '0d8aa05d306205850e3014550bce34735ac78660':
Add a privateImeOption to represent that the IME should not show
Merge commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8'
* commit 'e0d30d674d59f3f2b04ab07e14f50390f30024a8':
Revert the channge where channels were not selected randomly.
Merge commit 'b5868caa8cfe4b3fb14c04f64a71c20a172faaef' into eclair-mr2-plus-aosp
* commit 'b5868caa8cfe4b3fb14c04f64a71c20a172faaef':
Add a privateImeOption to represent that the IME should not show
Merge commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a' into eclair-mr2
* commit 'd3e4dab962109c634196bc38fb9830c7b8cc1d0a':
Add a privateImeOption to represent that the IME should not show
* changes:
Add a privateImeOption to represent that the IME should not show the voice input microphone, if it otherwise would, whenever the search dialog is planning on showing a voice search button (as specified by the current searchable).
the voice input microphone, if it otherwise would, whenever the
search dialog is planning on showing a voice search button (as
specified by the current searchable).
The IME will respect this shortly.
http://b/2228562
Merge commit 'bf2efbc0642d07acee1a83c17987abb380e5243a' into eclair-mr2-plus-aosp
* commit 'bf2efbc0642d07acee1a83c17987abb380e5243a':
Revert the channge where channels were not selected randomly.
Merge commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f' into eclair-mr2
* commit '3cf254d2ba303da3354ed65fd7f3136e87a56b9f':
Revert the channge where channels were not selected randomly.
Merge commit 'ccb2e1eada05fefed0c1f9f6d4fca45d307c2bfd'
* commit 'ccb2e1eada05fefed0c1f9f6d4fca45d307c2bfd':
Removed javadoc link to hidden class (temporary fix for build)
Merge commit '770dc6e5890c70af2b176770539d4afd4e904ff5'
* commit '770dc6e5890c70af2b176770539d4afd4e904ff5':
Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.
Merge commit '095f3411a1a032847bffe2e21f57e1f27cc8a64e'
* commit '095f3411a1a032847bffe2e21f57e1f27cc8a64e':
Copy the selection args when creating a CPO since callers often reuse the passed in array.
Merge commit 'df4bc1d1d508a6482fa9985d415e3e3afc114a28'
* commit 'df4bc1d1d508a6482fa9985d415e3e3afc114a28':
When upgrading packages with shared user ids make sure we are eliminating
Merge commit '7fb4e4aaf2137474a6abe0d95888e133d4075527' into eclair-mr2-plus-aosp
* commit '7fb4e4aaf2137474a6abe0d95888e133d4075527':
Removed javadoc link to hidden class (temporary fix for build)
Merge commit '492dbe17527e27ba712d185a1eac22ae149c67c0' into eclair-mr2-plus-aosp
* commit '492dbe17527e27ba712d185a1eac22ae149c67c0':
Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.
Merge commit 'cd79e5e173e00995f072104f7a89cf4015a90efd' into eclair-mr2-plus-aosp
* commit 'cd79e5e173e00995f072104f7a89cf4015a90efd':
Copy the selection args when creating a CPO since callers often reuse the passed in array.
Merge commit 'a7bbedca97498e75b32c6f6ca4afe56d4cf481f7' into eclair-mr2-plus-aosp
* commit 'a7bbedca97498e75b32c6f6ca4afe56d4cf481f7':
When upgrading packages with shared user ids make sure we are eliminating
