Merge commit 'cf4fe3efaaae38153478ada5007f681e2e8a2008'
* commit 'cf4fe3efaaae38153478ada5007f681e2e8a2008':
Prevent a crash when webkit changes the selection.
Merge commit '449d42c9ac161a7f3bad3ca9f13568448f003910'
* commit '449d42c9ac161a7f3bad3ca9f13568448f003910':
Get drawable directory for the platform buttons.
Merge commit 'f6ca7fab5043e1c3e834c15b4e674ae0c5c37d0d' into eclair-plus-aosp
* commit 'f6ca7fab5043e1c3e834c15b4e674ae0c5c37d0d':
Prevent a crash when webkit changes the selection.
Merge commit '010bed7419e96f5310be25d9317405d360f90b9c' into eclair-plus-aosp
* commit '010bed7419e96f5310be25d9317405d360f90b9c':
Get drawable directory for the platform buttons.
Partial fix for http://b/issue?id=2081673
This prevents a crash. However, if the user continues typing
into the textfield, the selection is incorrect. The real solution
(forthcoming), will make sure that the WebTextView's text gets
updated when webkit updates.
Change-Id: Ic832ec48fd4236c8116c5cbda1467677ad731feb
Merge commit '743a7495ab365d8a84a25ac93e22b6e6e4c5e0b4'
* commit '743a7495ab365d8a84a25ac93e22b6e6e4c5e0b4':
Make new attribute EXTRA_CHANGED_COMPONENT_NAME in
Merge commit '23db17314d32b56727123d21e3ca899a441c2a60' into eclair-plus-aosp
* commit '23db17314d32b56727123d21e3ca899a441c2a60':
Make new attribute EXTRA_CHANGED_COMPONENT_NAME in
* changes:
Make new attribute EXTRA_CHANGED_COMPONENT_NAME in broadcast intent ACTION_PACKAGE_CHANGED public so that apps like launcher can find out the changed component name when loading changes made in components.
broadcast intent ACTION_PACKAGE_CHANGED public so that
apps like launcher can find out the changed component name
when loading changes made in components.
Merge commit '4e016f200094d262040d82559f3833dc809a4db8'
* commit '4e016f200094d262040d82559f3833dc809a4db8':
SMS-to-email fix for messages from the web
Merge commit '983b837ea1effc462ecd9c14620b19178f98fd92' into eclair-plus-aosp
* commit '983b837ea1effc462ecd9c14620b19178f98fd92':
SMS-to-email fix for messages from the web
Merge commit '29dab8278a53f02868dea5579c49a98018a21317' into eclair-plus-aosp
* commit '29dab8278a53f02868dea5579c49a98018a21317':
Read forward address from file for DRT, fallback to default address
Merge commit '04e1faf0f030ddb360180289fb798adbb3348dd4' into eclair-plus-aosp
* commit '04e1faf0f030ddb360180289fb798adbb3348dd4':
Cleaner way to fix the -1 count problem (and removing an Eclipse warning along the way).
Merge commit '7a797a02afafc1fcbdbe66d564f036c7ef38211f'
* commit '7a797a02afafc1fcbdbe66d564f036c7ef38211f':
Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.
Merge commit 'db7dde6bd3f6352bb9af3b03232a9407a53d87e2'
* commit 'db7dde6bd3f6352bb9af3b03232a9407a53d87e2':
Adding a convenience method to resolve contact lookup URI to a regular content URI
Merge commit '585fb14c56bd6cdce1f84246bad40e144dd1db61'
* commit '585fb14c56bd6cdce1f84246bad40e144dd1db61':
Print error message if the buffer size is too small.
Merge commit 'c75857873536d4206ba02c0f84fcd2dfd9bc05ea'
* commit 'c75857873536d4206ba02c0f84fcd2dfd9bc05ea':
Store CA certificate chain into one single key entry with PEM format.
Merge commit '8ecd2aecf66010e974d9125f40282168be76b440' into eclair-plus-aosp
* commit '8ecd2aecf66010e974d9125f40282168be76b440':
Fix some sign in errors.
