Kenny Guy 6699748d68 resolved conflicts for merge of 06cc91a6 to master ...

Change-Id: I9e66cd0f41a5b26592a802c4cacbac772d663b73

2014-08-21 14:34:37 +01:00

..

accessibilityservice

…

accounts

…

alsa

…

animation

Fix NPEs when inflating a ValueAnimator.

2014-08-08 11:17:50 -07:00

annotation

…

app

resolved conflicts for merge of 06cc91a6 to master

2014-08-21 14:34:37 +01:00

appwidget

Fixing wrong tag usage

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

bluetooth

Merge "Fix threading issue for advertising." into lmp-dev

2014-08-21 04:10:51 +00:00

content

More progress towards split APKs in ASECs.

2014-08-20 12:47:27 -07:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

Merge "Step Counter documentation fix." into lmp-dev

2014-08-20 16:06:26 +00:00

inputmethodservice

Deprecate InputMethodService.enableHardwareAcceleration()

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

net

Less intrusive VPN dialog and other UX tweaks.

2014-08-20 16:55:28 -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

Set the TTS voice name for the default language.

2014-08-05 14:50:34 +01:00

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

Implement full View.buildLayer

2014-08-20 15:54:07 -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

…