Andreas Gampe 4d64addc20 am 43d02564: resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp ...

* commit '43d0256429c46a1243c8d85a34d029b40fd5e34e':
  Frameworks/base: Early init native bridge

2014-09-24 23:02:38 +00:00

..

accessibilityservice

…

accounts

…

alsa

…

animation

…

annotation

…

app

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

2014-09-24 20:57:21 +00:00

appwidget

…

bluetooth

…

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

am 43d02564: resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp

2014-09-24 23:02:38 +00:00

preference

…

print

…

printservice

…

provider

am c501947a: Merge commit \'edd57a98\' into fix-conflict

2014-09-19 06:44:44 +00: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 127ba8ff: am 4fec1b48: am 600ca140: Merge "Use constants instead of resources for ellipsis."

2014-09-19 23:41:01 +00:00

transition

Target only shared elements with shared element Transition

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

util

…

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

…

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

…