Jeff Brown 4e5c089ef3 resolved conflicts for merge of 337e764d to master ...

Change-Id: I8168dbf42b68c2f7b5ccb300e0080dddc627af26

2014-04-11 01:33:20 -07:00

..

accessibilityservice

Added accessibility APIs for introspecting interactive windows.

2014-03-20 16:52:59 +00:00

accounts

…

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 "Adding render stats APIs to UiAutomation (framework)."

2014-04-10 19:32:59 +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 337e764d to master

2014-04-11 01:33:20 -07:00

database

…

ddm

…

debug

Remove unused JNITest class

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

emoji

…

gesture

…

hardware

resolved conflicts for merge of 337e764d to master

2014-04-11 01:33:20 -07:00

inputmethodservice

Allow IMEs to start/stop receiving onUpdateCursor callback

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

net

Merge "Revert "Refactor IpConfiguration from WifiConfiguration""

2014-04-07 09:01:43 +00: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 337e764d to master

2014-04-11 01:33:20 -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

Update SearchIndexablesContract

2014-04-09 13:17:42 -07:00

security

…

service

resolved conflicts for merge of 337e764d to master

2014-04-11 01:33:20 -07:00

speech

Documentation update for TextToSpeech#getFeatures

2014-03-24 15:07:03 +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

Add equals, hashCode, and toString methods in TvInputInfo.

2014-04-11 11:24:26 +09:00

util

Merge "Support for new gTLDs"

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

view

resolved conflicts for merge of 337e764d to master

2014-04-11 01:33:20 -07:00

webkit

Switch WebView to onDetachedFromWindowInternal

2014-03-06 15:54:54 -08:00

widget

Switch DisplayListData to a staging model

2014-04-09 15:48:00 -07:00

package.html

…