Michael Kolb f4399e7243 resolved conflict for merge from d42eeab2 to master ...

Change-Id: I41bd238f0628110c923b79259de4cd11a783340c

2014-04-17 18:00:40 -07:00

..

accessibilityservice

Adding system support for a single accessibility focus.

2014-04-11 11:21:48 -07:00

accounts

Add APIs for obtaining themed Drawable from Theme, Context

2014-02-03 18:42:24 -08:00

alsa

Implement USB Audio across Nexus Devices

2014-04-11 12:18:44 -07:00

animation

Add RevealAnimator

2014-03-27 18:30:20 -07:00

annotation

Add resource reference annotations

2014-03-27 13:07:00 -07:00

app

Merge "Add RouteProviders to the new Media APIs"

2014-04-17 22:13:30 +00:00

appwidget

App widget backup/restore infrastructure

2014-03-20 12:30:51 -07:00

bluetooth

am 54499194: am 2e8a2d20: Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev

2014-04-10 01:07:26 +00:00

content

Merge "Add RouteProviders to the new Media APIs"

2014-04-17 22:13:30 +00:00

database

…

ddm

…

debug

Remove unused JNITest class

2014-02-21 14:34:35 +00:00

emoji

Use long for pointers in EmojiFactory and PdfDocument

2014-01-31 12:03:28 +00:00

gesture

…

hardware

Merge "Camera2 API: fix wrong logic in handling last frame number."

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

inputmethodservice

Allow IMEs to start/stop receiving onUpdateCursor callback

2014-04-04 04:34:44 +09:00

net

Class for managing the active scorer application.

2014-04-16 14:17:01 -07:00

nfc

am 4d328a79: am a43f7cb0: am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field."

2014-03-06 16:21:46 +00:00

os

resolved conflicts for merge of 3ee9dc58 to master

2014-04-16 14:18:49 -07:00

preference

Add Preference highlighting

2014-04-16 16:01:13 -07:00

print

Merge "Update print docs"

2014-03-18 18:00:01 +00:00

printservice

…

provider

Class for managing the active scorer application.

2014-04-16 14:17:01 -07:00

security

…

service

Rename basePkg to opPkg

2014-04-16 18:51:25 +02:00

speech

Remove "final" from TextToSpeechClient class.

2014-04-10 16:17:09 +00:00

test

…

text

Fix extra text appearing after ellipsis

2014-04-03 15:52:08 -07:00

transition

Split Activity Transitions out of PhoneWindow.

2014-04-17 09:49:25 -07:00

tv

Merge "Remove TvInputSession"

2014-04-15 21:32:16 +00:00

util

Merge "Support for new gTLDs"

2014-03-28 23:35:10 +00:00

view

resolved conflict for merge from d42eeab2 to master

2014-04-17 18:00:40 -07:00

webkit

Merge "Revert "Revert "Define new general permission APIs for webview."""

2014-04-16 12:45:24 +00:00

widget

Merge changes Ia693f512,If3b7d41f

2014-04-17 19:21:14 +00:00

package.html

…