Kenny Root 027610a76e resolved conflicts for merge of 964eb438 to master ...

Change-Id: I0c54d6b88356d8734d7f51234b0114434414502e

2010-10-18 13:03:35 -07:00

..

accessibilityservice

…

accounts

…

animation

Merge "Remove errant minus sign"

2010-10-14 15:07:30 -07:00

annotation

…

app

resolved conflicts for merge of 964eb438 to master

2010-10-18 13:03:35 -07:00

appwidget

…

bluetooth

am 81df9841: am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo

2010-10-17 13:49:45 -07:00

content

NFC: Move NFC service implementation out of system_server.

2010-10-17 18:35:29 -07:00

database

when printing requery on UI warning, include additional info

2010-10-08 14:48:48 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

am 9df14085: am 29332971: Merge "Add javadoc for display orientation." into gingerbread

2010-10-08 18:28:38 -07:00

inputmethodservice

resolved conflicts for merge of 2da9338c to master

2010-10-11 10:37:51 -07:00

net

Make fields in WebAddress private, add getters/setters

2010-10-13 16:21:01 +01:00

nfc

NFC: Move NFC service implementation out of system_server.

2010-10-17 18:35:29 -07:00

os

am 13e46665: am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to have their UID changed over time." into gingerbread

2010-10-18 08:04:47 -07:00

pim

Refrain warning when not appropriate. Do not merge

2010-10-04 07:59:34 -07:00

preference

am ca1db5ae: am dd644c17: Fallback to SharedPreferences.commit() when no apply() exists.

2010-10-11 17:43:06 -07:00

provider

resolved conflicts for merge of c6bf3eaa to master

2010-10-15 11:20:42 -07:00

security

…

server

am 096a1e6c: am 8b525c07: Merge "Check for state before disconnecting." into gingerbread

2010-10-15 14:27:55 -07:00

service/wallpaper

Remove the unused UrlRendererService

2010-10-12 15:14:27 +01:00

speech

…

test

…

text

Add keycodes and meta-key modifiers to support external keyboards.

2010-10-15 16:00:07 -07:00

util

Fix typos in JSON documentation.

2010-10-15 17:33:54 -07:00

view

am c1a564b1: Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread

2010-10-15 18:40:39 -07:00

webkit

Merge "Rename DeviceOrientationManager to DeviceMotionAndOrientationManager"

2010-10-18 10:40:47 -07:00

widget

Hide ButtonGroup - not ready for public consumption.

2010-10-18 11:11:19 -07:00

package.html

…