Andreas Gampe a2945aabd9 resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp ...

Change-Id: I3e9adb5fa67f8ca7ce8151c2dbf5c8fe5b40cb86

2014-09-24 15:47:36 -07:00

..

accessibilityservice

Clicking on partially coverd views by other views or windows.

2014-09-07 23:36:20 -07:00

accounts

…

alsa

…

animation

Allow Path Animations to support overshooting.

2014-09-12 15:46:02 -07:00

annotation

…

app

am 028332e9: am 5506d92e: Fix NPE when detached View is added as a shared element.

2014-09-24 20:49:33 +00:00

appwidget

…

bluetooth

Merge "Adds APIs for Bluetooth PBAP and MAP access permission." into lmp-dev

2014-09-16 01:19:19 +00:00

content

am e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev

2014-09-24 00:05:53 +00:00

database

…

ddm

Adds support for Theme dumping via DDM.

2014-09-18 11:29:08 -07:00

debug

…

emoji

…

gesture

…

hardware

Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev

2014-09-23 22:50:30 +00:00

inputmethodservice

…

net

am 19733a32: am c17062e5: am 71915080: am 6974f6a9: Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev

2014-09-24 04:13:50 +00:00

nfc

Upper-case incoming AIDs.

2014-09-16 16:06:45 -07:00

os

resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp

2014-09-24 15:47:36 -07:00

preference

…

print

Print spooler UI polish and bug fixes.

2014-09-05 15:21:50 -07:00

printservice

…

provider

Merge commit 'edd57a98' into fix-conflict

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

security

…

service

Zen: Add events as a new config attribute.

2014-09-22 16:44:37 -04:00

speech

Fix issues with new TTS API

2014-09-22 17:39:16 +01:00

test

…

text

am 4fec1b48: am 600ca140: Merge "Use constants instead of resources for ellipsis."

2014-09-19 23:16:52 +00:00

transition

Target only shared elements with shared element Transition

2014-09-19 12:55:20 -07:00

util

add android.util.SizeF.parseSizeF()

2014-09-09 21:16:03 -07:00

view

am 0444464b: am 8b5f8df1: am 3ee4d02c: am 176b1955: Merge "Ignore not visible views computing click point for accessibility." into lmp-dev

2014-09-24 16:20:45 +00:00

webkit

am 6e6ae86a: am 46683a27: Remove an @removed member of andorid.webkit.WebResourceResponse.

2014-09-12 19:19:04 +00:00

widget

am 7c673645: am 76cedc5b: am 0bff30ba: am c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev

2014-09-23 21:30:55 +00:00

package.html

…