Mike Lockwood 1e0207674d resolved conflicts for merge of 2f7d7c9b to ics-aah ...

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: I851866d74ff9674bfb7ff652d8be65da342273c0
Signed-off-by: Mike Lockwood <lockwood@android.com>

2011-09-18 18:25:44 -04:00

..

accessibilityservice

Intra-process view hierarchy interrogation does not work.

2011-08-24 16:26:43 -07:00

accounts

Add a generic account chooser/add account flow for apps.

2011-09-15 17:40:43 -07:00

animation

Add end functionality to LayoutTransition

2011-09-07 10:51:00 -07:00

annotation

…

app

am 7c963167: Merge "Fix "am profile" when run on system_server."

2011-09-16 15:12:49 -07:00

appwidget

Getting rid of the (hidden) oldName parameter for widgets

2011-08-17 11:37:58 -07:00

bluetooth

Add error codes for channel disconnection / connection.

2011-09-08 15:26:53 -07:00

content

Be more forgiving in parsing verifier IDs

2011-09-15 21:04:57 -07:00

database

Add AbstractCursor.setExtras()

2011-08-31 14:17:55 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

am ab6d77a4: Merge "Tweak DELAY_UI for 16Hz to 15Hz"

2011-09-14 18:22:21 -07:00

inputmethodservice

Merge "Call onFinishInputView in onDestroy"

2011-09-14 21:13:06 -07:00

net

Merge "Retain DNS information from DHCP request"

2011-09-18 13:31:12 -07:00

nfc

Merge "Fix Activity ref-leak in NFC dispatch API."

2011-09-02 12:50:27 -07:00

os

am daa98fe9: Merge "Revert "Forces AsyncTask to use the main looper Bug #5333924""

2011-09-16 21:05:07 -07:00

pim

…

preference

Fix bug 5067075 - missing scrollbar when entering long signatures

2011-08-28 14:36:05 -07:00

provider

Merge "Network stats flag to force complete poll."

2011-09-14 21:44:19 -07:00

server

Merge "Use an integer for the channel id."

2011-09-14 14:46:20 -07:00

service

Fix issue #5273986: The power usage of the mp3 background playback...

2011-09-09 13:02:43 -07:00

speech

Don't wait indefinitely for audio tracks to finish playing.

2011-09-14 16:51:05 +01:00

test

…

text

Bug 5281947: add to dictionnary option promoted in suggestions.

2011-09-09 17:01:31 -07:00

util

Fix bug #5199577 TextView with android:password="true" is showing the "dots" on the left even if the password chars are RTL

2011-08-25 18:43:37 -07:00

view

Fix issue #5242779: Device not responding to touch on unlock screen

2011-09-18 14:52:52 -07:00

webkit

Don't switch to handle drag mode when starting selection

2011-09-16 13:23:43 -07:00

widget

am 79aa4030: Merge "Can\'t stop the fling! Bug: 5335420" into ics-factoryrom

2011-09-16 23:30:52 -07:00

package.html

…