Jeff Sharkey 35d857002d am 8059bcbf: resolved conflicts for merge of 1162fd77 to eclair-mr2 ...

Merge commit '8059bcbfa71c8233e616304843d9280f5f1615bb' into eclair-mr2-plus-aosp

* commit '8059bcbfa71c8233e616304843d9280f5f1615bb':
  Let RemoteViews nest children, allow ViewFlipper.

2009-11-16 14:55:37 -08:00

..

accessibilityservice

…

accounts

fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange

2009-11-13 16:21:52 -08:00

annotation

…

app

am b0d2313e: am d05fd6c3: am dbc7e27e: docs: document the \'showSearchIconAsBadge" flag and "icon" attribute as deprecated. bug 2105329

2009-11-13 11:33:26 -08:00

appwidget

Prevent crash in Home when using widgets whose ids collide with Home's

2009-11-05 15:40:35 -08:00

backup

…

bluetooth

am 13ce56bd: am 88427cff: Merge change Ibcfb7d10 into eclair-sdk

2009-11-10 09:40:48 -08:00

content

am 1aa9f3ca: Merge change I923d7d72 into eclair

2009-11-12 23:10:18 -08:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

Add documentation for proximity and light sensors.

2009-11-03 10:36:24 -05:00

inputmethodservice

Fix build.

2009-10-27 11:45:08 -07:00

net

Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp

2009-10-08 17:52:53 -07:00

os

Fix the SDK build.

2009-11-14 16:32:13 -08:00

pim

Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.

2009-11-17 06:16:22 +09:00

preference

Fix preference caching to increase recycling of preference views.

2009-10-05 15:31:47 -07:00

provider

resolved conflicts for merge of 2a1e9641 to eclair-mr2

2009-11-12 22:44:11 -08:00

security

…

server

am 3c58d279: Merge change I738ed802 into eclair

2009-11-11 23:31:31 -08:00

service/wallpaper

Fix issue #2170897: wallpaper touch-up event not seen when exiting lock screen

2009-11-10 13:02:30 -08:00

speech

…

test

…

text

am dad4780b: Merge change I3834b1cb into eclair-mr2

2009-10-19 14:04:00 -07:00

util

doc change: misc doc fixes.

2009-10-30 19:44:22 -07:00

view

am 11cff8cd: Merge change Ie211adae into eclair

2009-11-09 19:34:42 -08:00

webkit

Fix bugs around removing and attaching WebViews.

2009-11-16 11:47:12 -05:00

widget

resolved conflicts for merge of 1162fd77 to eclair-mr2

2009-11-16 14:49:07 -08:00

package.html

…