John Reck 3bae94d78e resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aosp ...

Change-Id: I60bf82ff71d9af0d80e7da8856efb4641c85885b

2014-12-09 15:38:38 -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

am 20a46fb1: am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev

2014-12-08 19:43:38 +00:00

appwidget

…

bluetooth

am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev

2014-12-08 19:16:37 +00:00

content

am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev

2014-12-04 20:23:45 +00:00

database

…

ddm

…

debug

…

emoji

…

gesture

am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references"

2014-10-17 14:59:48 +00:00

hardware

Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033

2014-12-09 23:20:39 +00:00

inputmethodservice

Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting

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

net

am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs

2014-12-09 21:34:06 +00:00

nfc

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

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

os

resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp

2014-12-09 10:16:46 +01: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

am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev

2014-12-08 19:36:27 +00:00

security

…

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

am 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-mr1-dev

2014-12-08 19:13:14 +00:00

transition

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

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

util

am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev

2014-12-08 19:33:49 +00:00

view

resolved conflicts for merge of fe11126d to lmp-mr1-dev-plus-aosp

2014-12-09 15:38:38 -08:00

webkit

am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache."

2014-11-27 18:03:15 +00:00

widget

am 4b944f3a: am 7781647a: Merge "Fix auto-advance regression in radial time picker" into lmp-mr1-dev

2014-12-09 00:30:49 +00:00

package.html

…