Deepanshu Gupta b95475404e resolved conflicts for merge of 20db8770 to master ...

Change-Id: Ifffcf8e2741ec242d940c3ba81244d4df57642fc

2015-01-06 16:41:58 -08:00

..

accessibilityservice

Move default token handling into WindowManagerImpl

2014-11-19 17:02:16 -08:00

accounts

…

alsa

…

animation

Fix docs build

2014-12-05 11:11:55 -08:00

annotation

…

app

am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev

2015-01-05 21:50:18 +00:00

appwidget

Avoid non-static innner classes that are passed over via IPC.

2014-12-18 02:04:46 +00:00

bluetooth

am f6b62a9d: am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev

2014-12-16 17:30:33 +00:00

content

Merge "Allow use of theme attributes in color state lists"

2015-01-06 18:47:29 +00:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

am 877919bb: am 6cfb4495: Merge "CEC: Let MHL device be of type \'source\'" into lmp-mr1-dev

2015-01-05 07:25:06 +00:00

inputmethodservice

Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting

2014-12-02 16:24:24 -08:00

midi

Merge "MidiManager: Improve Javadoc"

2014-12-11 17:26:40 +00:00

net

am 932bfab9: am 6c93739f: am 9ffb53cb: Clear process DNS NetID binding when expiring or releaseing legacy requests.

2015-01-06 20:09:18 +00:00

nfc

am 3d6cfe0e: am 873b291b: Merge "fix issuse 65774"

2015-01-02 10:34:03 +00:00

os

am be8053a2: am 5ae63a25: Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class."

2014-12-29 12:21:25 +00:00

preference

am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev

2015-01-06 22:22:36 +00:00

print

…

printservice

Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT""

2014-12-29 10:02:28 +00:00

provider

am f9f41951: am ee435b16: Merge "telephony: Update comments for preferred network mode"

2014-12-26 19:01:39 +00:00

security

…

service

Revert "Add overscan insets to surface frame dimensions in WallpaperService."

2014-12-09 18:32:07 +00:00

speech

Add UtteranceProgressListener#onStop callback

2014-12-09 11:06:06 +00:00

test

…

text

am 3ac280c9: am 078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev

2014-12-17 23:21:16 +00:00

transition

Unhid ChangeScroll

2015-01-05 18:48:49 +00:00

util

am 0cfdd810: am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev

2014-12-09 00:59:01 +00:00

view

Merge "Make DisplayListRenderer inherit from Canvas, merge JNI"

2015-01-05 23:31:30 +00:00

webkit

Add WebView documentation about the layout height parameter.

2014-12-15 11:26:16 +00:00

widget

am 9c8f8ed8: am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev

2015-01-05 23:39:03 +00:00

package.html

…