Robert Greenwalt 1b98e90db0 resolved conflicts for merge of 0bff77d6 to master ...

Change-Id: Ia4c86126079740978658a05579b56d59d41a7b01

2014-03-19 12:41:54 -07:00

..

accessibilityservice

…

accounts

Add APIs for obtaining themed Drawable from Theme, Context

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

animation

AArch64: Use of long for pointers in PropertyValuesHolder

2014-01-29 11:07:06 +00:00

annotation

…

app

Merge "Add flag to allow fetching related users recent tasks."

2014-03-18 11:43:46 +00:00

appwidget

Tabs -> spaces in frameworks/base.

2014-02-25 09:49:29 -05:00

bluetooth

am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev

2014-03-08 02:05:57 +00:00

content

Treat IME processes as hosting activities

2014-03-17 16:04:21 -07:00

database

am df8b604e: Merge "Fix NPE in deleteDatabase()." into klp-modular-dev

2014-01-28 00:13:27 +00:00

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: Update exposureTimeRange related docs"

2014-03-19 02:12:08 +00:00

inputmethodservice

…

net

resolved conflicts for merge of 0bff77d6 to master

2014-03-19 12:41:54 -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

am 06fe82d8: am 2e6d960c: am cdf00888: add option to shutdown after factory reset

2014-03-18 21:00:04 +00:00

preference

Tabs -> spaces in frameworks/base.

2014-02-25 09:49:29 -05:00

print

Merge "Update print docs"

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

printservice

…

provider

am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev

2014-03-13 20:36:51 +00:00

security

…

service

Manually merge commit '2faf28cf' into master

2014-03-04 15:25:43 -08:00

speech

Make InternalListener static to avoid referencing SpeechRecognizer.

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

test

…

text

Tabs -> spaces in frameworks/base.

2014-02-25 09:49:29 -05:00

transition

Fix problem with Animators pausing the wrong Window.

2014-03-06 14:36:28 -08:00

util

am ad35099a: am b485d8e1: am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement."

2014-03-11 12:11:39 +00:00

view

Merge "Revert "VideoPlaneView initial implementation""

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

webkit

Switch WebView to onDetachedFromWindowInternal

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

widget

Rename DisplayList->RenderNode

2014-03-17 10:30:32 -07:00

package.html

…