Jeff Brown 047f3c71a4 resolved conflicts for merge of 3ee9dc58 to master ...

Change-Id: Idd045d01246367b77718210c8b6665110da58ac4

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

..

accessibilityservice

Adding system support for a single accessibility focus.

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

accounts

…

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

am 4b81e89d: am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev

2014-04-16 20:13:09 +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

resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp

2014-04-16 12:14:34 -07:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

Rename basePkg to opPkg

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

inputmethodservice

Allow IMEs to start/stop receiving onUpdateCursor callback

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

net

Stub APIs for network scoring.

2014-04-16 11:55:14 -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

Update list item text appearance

2014-04-09 16:52:54 -07:00

print

Merge "Update print docs"

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

printservice

…

provider

Merge "Add a contract class for the TV content provider"

2014-04-14 21:31:16 +00: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

Add Transitions useful for Activity transitions.

2014-04-07 09:14:09 -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

am 50d7bfd8: DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for views

2014-04-15 17:57:46 +00:00

webkit

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

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

widget

am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]

2014-04-16 18:39:25 +00:00

package.html

…