Adam Powell 67bb674196 am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread ...

Merge commit '17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp

* commit '17efcde161cbcbc0d98bf809036c5e640497f001':
  DO NOT MERGE Fix bug 3124899 - timeout in CTS test

2010-10-25 12:07:51 -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 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread

2010-10-24 18:38:11 -07:00

appwidget

merge from open-source master

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

bluetooth

am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo

2010-10-15 18:23:34 -07:00

content

am abb50f15: Merge "docs: fix a couple api links" into gingerbread

2010-10-25 11:27:55 -07:00

database

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

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

ddm

…

debug

…

emoji

…

gesture

…

hardware

Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread

2010-10-21 16:20:07 -07: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

Fixed NdefTag parcelable conversion methods.

2010-10-25 08:55:36 -07:00

os

am 38993d8d: Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread

2010-10-22 14:03:08 -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 7ea5c45e: NFC settings cleanup.

2010-10-21 09:38:15 -07:00

security

…

server

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

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

service

Fix a race condition in wallpaper move throttling.

2010-10-21 17:36:54 -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

Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE

2010-10-21 15:32:06 -07:00

view

am c1a564b1: Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread

2010-10-15 18:40:39 -07:00

webkit

am 59993d9b: Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread

2010-10-19 12:44:19 -07:00

widget

am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread

2010-10-25 12:07:51 -07:00

package.html

…