Gilles Debunne 63bd55c7bf am cdfe8999: Fix for multiple merge problem. ...

* commit 'cdfe899991c365d9e197d83f8859089cae082011':
  Fix for multiple merge problem.

2011-02-08 17:31:33 -08:00

..

accessibilityservice

…

accounts

Fix bug in permission grant system.

2010-12-09 16:53:33 -08:00

annotation

…

app

am 0716ea14: Merge "Javadoc updates for NFC." into gingerbread

2011-01-18 11:26:39 -08:00

appwidget

…

bluetooth

am 1c9761e3: Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread

2011-01-21 21:36:32 -08:00

content

am e6c6b760: DO NOT MERGE Fix issue #3408542: "resizeable" attribute required to get out of compat mode

2011-01-31 14:36:02 -08:00

database

am 69ea4e15: Documentation fixes found over vacation hacking.

2011-01-05 13:52:53 -08:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

fix [3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE

2011-01-16 19:11:20 -08:00

inputmethodservice

Made paste work in ExtractEditText

2010-10-08 18:23:49 -07:00

net

am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread

2011-01-29 06:55:38 -08:00

nfc

Fix docs type that broke build.

2011-02-03 16:23:58 -08:00

os

am 1358b6a4: Tweak to make merges easier

2011-01-29 14:43:33 -08:00

pim

Refrain warning when not appropriate. Do not merge

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

preference

Fixing memory leak in PreferenceScreen.

2011-01-18 14:34:52 +01:00

provider

Merge from gingerbread

2011-02-03 13:17:49 -08:00

security

…

server

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

2010-10-14 13:41:16 -07:00

service

Fix for crash when setting live wallpaper.

2011-01-12 15:41:55 +01:00

speech

Bug 3365937 notify TTS initialization listener of binding errors

2011-01-20 17:25:48 -08:00

test

…

text

JPtextinput: Dont break emoji characters when cutting strings.

2011-01-10 08:23:15 +01:00

util

Fix issue #3224616: TimeUtils.formatDuration() can drop 0s.

2010-12-20 15:23:02 -08:00

view

am ded2b006: Merge "frameworks/base: remove redundant code in WindowManager"

2011-01-18 13:20:06 -08:00

webkit

am dbf09fee: am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"

2011-02-01 13:12:04 -08:00

widget

am cdfe8999: Fix for multiple merge problem.

2011-02-08 17:31:33 -08:00

package.html

…