Deepanshu Gupta f5b02eb7c4 resolved conflicts for a0bc2e7e to lmp-mr1-dev ...

The original change wasn't properly merged into lmp-mr1-dev because of
merge conflicts. This change manually resolves the conflicts. The main
reason for the conflict was that TimePickerSpinnerDelegate was swapped
with TimePickerClockDelegate.

This change also fixes the typo in the original change which was fixed
in a subsequent change.

Original commit: 12b6d29b7b
fix for typo: cb09bc45c5

Change-Id: I50bf8c2d86318f632465a38adfad16d1382a9319

2014-12-30 14:07:29 -08:00

..

accessibilityservice

Move default token handling into WindowManagerImpl

2014-11-19 17:02:16 -08:00

accounts

New AccountManager method to copy accounts between users.

2014-11-14 11:09:27 +00:00

alsa

…

animation

Fix docs build

2014-12-05 11:11:55 -08:00

annotation

…

app

Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev

2014-12-18 19:30:40 +00:00

appwidget

Removing context ref from AppWidgetHost. (Bug 18769791)

2014-12-17 11:07:24 -08:00

bluetooth

Don't send the onServiceDisconnected callback after close.

2014-12-16 15:33:03 +00:00

content

Fix NPE in Transport.applyBatch

2014-12-15 13:25:52 -08:00

database

Print services setting changes not handled for managed profiles.

2014-08-26 18:19:13 -07:00

ddm

Adds support for Theme dumping via DDM.

2014-09-18 11:29:08 -07:00

debug

…

emoji

…

gesture

…

hardware

camera2: Fix LEGACY YUV production and orientation.

2014-12-11 11:35:46 -08:00

inputmethodservice

Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting

2014-12-02 16:24:24 -08:00

net

Merge "Add toString in NetworkFactory." into lmp-mr1-dev

2014-12-11 16:59:13 +00:00

nfc

Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev

2014-11-20 17:59:24 +00:00

os

Fix issue #18706195: Improve label names of memory types

2014-12-10 16:54:13 -08:00

preference

Volume: Improve inline volume controls used in settings.

2014-11-28 15:29:21 -05:00

print

Crash apps that print malformed or password protected PDFs.

2014-11-01 00:06:08 +00:00

printservice

…

provider

Add global setting for ephemeral network timeout.

2014-12-16 13:30:06 -08:00

security

Keep managed profile keystores in sync with owner

2014-08-29 23:03:42 +01:00

service

Revert "Add overscan insets to surface frame dimensions in WallpaperService."

2014-12-09 18:32:07 +00:00

speech

Fix race in RecognizerService teardown.

2014-10-02 12:10:08 -07:00

test

…

text

Revert "Change Linkify leniency to VALID"

2014-12-17 14:31:39 -08:00

transition

Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev

2014-11-20 15:29:26 +00:00

util

Fix issue #17323751: Additional items in aggregated battery stats

2014-12-05 13:54:24 -08:00

view

Fix a race in accessibility manager.

2014-12-29 09:40:46 -08:00

webkit

Rename callDrawGLFunction

2014-11-20 14:40:52 -08:00

widget

resolved conflicts for a0bc2e7e to lmp-mr1-dev

2014-12-30 14:07:29 -08:00

package.html

…