Neil Fuller 7014da74e8 resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp ...

Change-Id: Idfa2750230aa56e7ae34fcc33d62558df942abd0

2015-01-20 13:21:58 +00: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 02c7c97a: am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-mr1-dev

2015-01-16 21:07:13 +00:00

appwidget

Removing context ref from AppWidgetHost. (Bug 18769791)

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

bluetooth

am f6b62a9d: am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev

2014-12-16 17:27:46 +00:00

content

am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev

2015-01-16 18:47:08 +00:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

am e02fe5af: am c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase"

2015-01-07 18:42:57 +00:00

inputmethodservice

Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting

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

net

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

2015-01-20 13:21:58 +00:00

nfc

am 3d6cfe0e: am 873b291b: Merge "fix issuse 65774"

2015-01-02 10:34:03 +00:00

os

am 17f50f81: am d8beca64: Merge "Remove support for --classpath and make --runtime-init the default."

2015-01-19 15:21:30 +00:00

preference

am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev

2015-01-06 22:22:36 +00:00

print

Crash apps that print malformed or password protected PDFs.

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

printservice

Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT""

2014-12-29 10:02:28 +00:00

provider

am f9f41951: am ee435b16: Merge "telephony: Update comments for preferred network mode"

2014-12-26 18:59:22 +00:00

security

Generate IKeystoreService using aidl

2015-01-13 18:29:15 -08:00

service

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

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

speech

…

test

…

text

am 2004fdf8: am 830f39ad: Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev

2015-01-16 22:25:01 +00:00

transition

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

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

util

Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1

2015-01-08 01:03:49 +00:00

view

am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev

2015-01-13 19:05:15 +00:00

webkit

am d4bc9577: am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev

2015-01-07 16:01:27 +00:00

widget

am dbe54533: am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev

2015-01-15 22:37:40 +00:00

package.html

…