Julia Reynolds b00889ddc2 resolved conflicts for merge of b259603d to master ...

Change-Id: Ia74bb64ce5946a86ecf05b8c4e258dd2ac68ba04

2014-08-20 22:42:08 -04:00

..

accessibilityservice

…

accounts

…

alsa

…

animation

…

annotation

…

app

am 5066ef8a: am 7224e1b2: am 7d98d0a0: Merge "Fix crash when launching Activities in \'android\' package" into lmp-dev

2014-08-20 19:33:23 +00:00

appwidget

Fixing wrong tag usage

2014-08-15 17:39:54 -07:00

bluetooth

Protect from malformed advt with invalid manf_id/data combo

2014-08-14 05:33:11 +00:00

content

Fix crash when launching Activities in 'android' package

2014-08-20 17:58:10 +00:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

CEC: Hook up device select API to MHL device RAP

2014-08-20 12:35:32 +09:00

inputmethodservice

Deprecate InputMethodService.enableHardwareAcceleration()

2014-08-14 20:06:02 +00:00

net

Stop using LinkProperties for static configuration.

2014-08-19 11:59:43 -07:00

nfc

Fix issue where unlock handlers are not properly updated

2014-08-15 17:08:24 +00:00

os

Prevent profile owners from setting certain user restrictions.

2014-08-20 16:06:29 -04:00

preference

Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings.

2014-08-14 18:00:11 +00:00

print

…

printservice

…

provider

Remove incomplete media router API. (DO NOT MERGE)

2014-08-19 20:08:52 -07:00

security

…

service

Rename restrictions API class and method

2014-08-19 17:03:41 -07:00

speech

…

test

…

text

Add optimizing line breaker

2014-08-18 12:25:17 -07:00

transition

Fixed ChangeBounds matching against the wrong View.

2014-08-19 14:39:47 -07:00

util

Fix issue #16794553: Duplicate ArrayMap entries in Bundle...

2014-08-13 17:24:45 -07:00

view

Add outlineProvider attribute

2014-08-19 18:04:14 -07:00

webkit

Store the WebView's package info.

2014-08-14 16:43:18 +01:00

widget

am 28646cf6: am 0f9a48b6: Merge "Use correct single-letter date format in SimpleMonthView" into lmp-dev

2014-08-21 00:44:26 +00:00

package.html

…