Kenny Root 8fda1636e3 am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread ...

Merge commit 'bdf8034c657147226b2390eef113ff841e0d6065' into gingerbread-plus-aosp

* commit 'bdf8034c657147226b2390eef113ff841e0d6065':
  OBB: use PBKDF2 for key generation.

2010-10-13 22:54:10 -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 51679ca8: Merge "bug:3069735 in Download UI app, handle deletes correctly" into gingerbread

2010-10-13 16:52:57 -07:00

appwidget

merge from open-source master

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

bluetooth

am a31cbd61: Merge "Remove STOPSHIP and reduce log spam." into gingerbread

2010-10-13 16:56:27 -07:00

content

am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread

2010-10-13 22:54:10 -07:00

database

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

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

ddm

…

debug

…

emoji

…

gesture

…

hardware

Add javadoc for display orientation.

2010-10-07 19:41:23 +08:00

inputmethodservice

Made paste work in ExtractEditText

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

net

am 3ed792d5: Merge "Don\'t perform DNS lookup in android.net.Proxy.isLocalHost"

2010-10-10 11:49:43 -07:00

nfc

NFC API revision round 2.

2010-10-12 18:37:26 -07:00

os

am 49ec3dff: Merge "OBB: Change documentation to reflect reality" into gingerbread

2010-10-13 14:53:18 -07:00

pim

Refrain warning when not appropriate. Do not merge

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

preference

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

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

provider

am 51679ca8: Merge "bug:3069735 in Download UI app, handle deletes correctly" into gingerbread

2010-10-13 16:52:57 -07:00

security

…

server

am c008ca96: Merge "Work around for errant headsets." into gingerbread

2010-10-13 16:48:41 -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 1da8d4d1: Merge "Fix an event injection bug when the policy is bypassed." into gingerbread

2010-10-11 17:26:51 -07:00

webkit

am 998c6777: Merge "Never show overscroll if the page scrolls at all." into gingerbread

2010-10-13 16:34:27 -07:00

widget

am 868322ce: Merge "Reduce the time it takes to decay the glow after a pull." into gingerbread

2010-10-13 16:25:59 -07:00

package.html

…