Brad Fitzpatrick 42a5ed2015 resolved conflicts for merge of 171c83f4 to master ...

Change-Id: I56a4c1838b17cf40d96763f95df3c84fc86359eb

2010-09-12 13:55:18 -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

Make fragment animations work when fragments go away

2010-09-10 17:43:04 -07:00

annotation

…

app

Make fragment animations work when fragments go away

2010-09-10 17:43:04 -07:00

appwidget

Adding callback and fix to RemoteViewsFactory on notifyDataSetChanged.

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

bluetooth

Decouple Tethering UI with registering of SDP records.

2010-09-02 14:34:40 -07:00

content

am e7578344: am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread

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

database

remove unnecessary synchronization object from SQLiteClosable.

2010-09-10 14:27:06 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Quell annoying Java ascii/unicode warning.

2010-09-06 19:22:09 -07:00

inputmethodservice

Made text selection work in ExtractEditText. DO NOT MERGE

2010-09-07 18:07:30 -07:00

net

Merge "Fix the build"

2010-09-09 14:26:38 -07:00

os

am 195dc210: am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread

2010-09-09 21:39:13 -07:00

pim

Fix again.

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

preference

am 9eb32c96: am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread

2010-09-03 13:27:51 -07:00

provider

resolved conflicts for merge of 171c83f4 to master

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

security

…

server

am 049912b7: am 9395b465: Merge "Fix to get A2DP to connect after unpairing" into gingerbread

2010-09-09 14:21:32 -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 75f0024c: am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread

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

view

Merge "Correct implementation of saveLayer()."

2010-09-12 12:25:13 -07:00

webkit

resolved conflicts for merge of 12e08f3a to master

2010-09-12 12:47:04 -07:00

webruntime

Fix NPE in the webruntime after the splash screen has been dismissed.

2010-07-08 12:26:50 +01:00

widget

Merge "-> Fixing some layout issues in StackView -> Made the highlight width depend on the screen density"

2010-09-10 17:25:44 -07:00

package.html

…