Daisuke Miyakawa 07fb33efe8 am d8f1a540: Merge "Refrain warning when not appropriate. Do not merge" into gingerbread ...

Merge commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2' into gingerbread-plus-aosp

* commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2':
  Refrain warning when not appropriate. Do not merge

2010-10-04 08:36:27 -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

am 751b4731: Merge "A few additions to the download manager public API documentation" into gingerbread

2010-10-01 13:16:17 -07:00

appwidget

merge from open-source master

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

bluetooth

resolved conflicts for merge of 0a972acf to gingerbread-plus-aosp

2010-09-30 16:29:13 -07:00

content

am 14e7d693: Merge "Some documentation fixes." into gingerbread

2010-10-01 17:02:18 -07:00

database

am 32e60c79: Update StrictMode\'s public API.

2010-10-01 13:05:02 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Fix the javadoc of Parameters.setRotation.

2010-09-30 10:49:43 -07:00

inputmethodservice

Initialize Keyboard.Key attributes from parent Keyboard.Row

2010-09-17 15:40:35 +09:00

net

am 0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbread

2010-09-30 19:12:11 -07:00

os

am 32e60c79: Update StrictMode\'s public API.

2010-10-01 13:05:02 -07:00

pim

Refrain warning when not appropriate. Do not merge

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

preference

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

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

provider

am cdcc0a65: Merge "Have download manager give more details when downloads are paused" into gingerbread

2010-09-30 11:42:16 -07:00

security

…

server

resolved conflicts for merge of 0a972acf to gingerbread-plus-aosp

2010-09-30 16:29:13 -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 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread

2010-09-27 12:37:03 -07:00

util

b/3054044 Make allDay event times format in utc

2010-10-01 11:01:01 -07:00

view

am 9e32a438: Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread

2010-10-01 16:16:23 -07:00

webkit

am a16682b5: Merge "Allow touch events when clickable *or* longClickable" into gingerbread

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

widget

am 624380a1: Fix bug 3047653 - Text select handles stick around when they shouldn\'t

2010-10-02 18:36:27 -07:00

package.html

…