Dianne Hackborn 03f3cb083d resolved conflicts for merge of 1f377298 to master ...

Change-Id: I0d92abae3a86792b47777f795143acc0489adfe4

2010-09-17 23:12:26 -07:00

..

accessibilityservice

…

accounts

am 6f50a956: am 799f2bb0: am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo

2010-08-06 19:07:24 -07:00

animation

Fix broken javadoc.

2010-09-16 16:01:53 -04:00

annotation

…

app

Add API for showing breadcrumbs of fragment back stack.

2010-09-16 18:36:04 -07:00

appwidget

Adding callback and fix to RemoteViewsFactory on notifyDataSetChanged.

2010-08-17 14:25:06 -07:00

bluetooth

am eb3b40af: am 0f584306: Fix Bluetooth Javadoc to clarify the maximum device name length.

2010-09-16 23:25:59 -07:00

content

Merge "Convert Numbers to Booleans when calling getAsBoolean()."

2010-09-17 10:21:55 -07:00

database

don't compile statement for certain SQL statements

2010-09-17 10:15:40 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

am 8f476407: am 08710dcd: Merge "part of fix for [3004226] Cannot end the call - Proximity sensor doesn\'t work" into gingerbread

2010-09-16 18:26:13 -07:00

inputmethodservice

am a79433cb: am ecd43cca: Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread

2010-09-17 00:05:52 -07:00

net

Enhance http proxy support

2010-09-17 16:14:10 -07:00

os

resolved conflicts for merge of 1f377298 to master

2010-09-17 23:12:26 -07:00

pim

Fix again.

2010-09-02 13:48:09 -07:00

preference

Add API for showing breadcrumbs of fragment back stack.

2010-09-16 18:36:04 -07:00

provider

am 4cd34abe: am 47874718: Merge "Support new URI structure for download provider." into gingerbread

2010-09-16 13:56:06 -07:00

security

…

server

am b390728b: am a224f70b: Fix interaction between BluetoothEventLoop and BluetoothService.

2010-09-15 07:07:38 -07:00

service

Force wallpaper surface to 565.

2010-09-08 16:32:27 -07:00

speech

Updated documentation for upcoming fix for @code tags

2010-08-26 14:02:20 -07:00

test

…

text

resolved conflicts for merge of 171c83f4 to master

2010-09-12 13:55:18 -07:00

util

am bfbab8ca: am a8cc20e5: Merge "b/3004029 Fixed content resolver loss" into gingerbread

2010-09-15 19:10:10 -07:00

view

resolved conflicts for merge of b39470b5 to master

2010-09-17 17:59:06 -07:00

webkit

Use website preferred width as the fixed viewport.

2010-09-17 10:54:48 -07:00

webruntime

…

widget

resolved conflicts for merge of b39470b5 to master

2010-09-17 17:59:06 -07:00

package.html

…