Dianne Hackborn 195dc210cb am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread ...

Merge commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2' into gingerbread-plus-aosp

* commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2':
  Small fixes to battery stats.

2010-09-09 21:34:33 -07:00

..

accessibilityservice

…

accounts

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

2010-08-06 18:55:05 -07:00

annotation

…

app

resolved conflicts for merge of 64591009 to gingerbread-plus-aosp

2010-09-07 21:41:09 -07:00

appwidget

merge from open-source master

2010-07-12 15:26:21 -07:00

bluetooth

manual merge

2010-08-20 15:58:49 -07:00

content

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

2010-09-08 14:34:31 -07:00

database

resolved conflicts for merge of e7731f0a to gingerbread-plus-aosp

2010-08-20 18:19:03 -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

am e3692d15: Merge "Hidden API to control sorting of download manager queries." into gingerbread

2010-09-09 11:26:08 -07:00

os

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

2010-09-09 21:34:33 -07:00

pim

Fix again.

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

preference

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

2010-09-03 12:49:44 -07:00

provider

am 0727a865: Merge "Add network condition reporting." into gingerbread

2010-09-09 09:49:15 -07:00

security

…

server

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

2010-09-09 10:26:54 -07:00

service

Force wallpaper surface to 565.

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

speech

Fix NPE in TextToSpeech with setLanguage(null)

2010-07-26 16:11:58 -07:00

test

…

text

am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread

2010-09-08 15:02:20 -07:00

util

Fixes to battery stats debug output.

2010-09-07 14:09:36 -07:00

view

Add support for secure views.

2010-09-08 11:50:55 -07:00

webkit

am 79492a0d: Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread

2010-09-02 00:31:03 -07:00

widget

am 47fa8e80: Fix for an IndentOutOfBounds in TextField.

2010-09-09 12:14:59 -07:00

package.html

…