Chad Brubaker 29f4d9f9ea resolved conflicts for merge of 3d64a850 to lmp-mr1-dev-plus-aosp ...

Change-Id: Ieed2c2a3b9977c30bc5318317c91c29907aa1377

2015-01-14 13:51:45 -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 206d31f5: am 42ebaa43: Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev

2015-01-14 19:24:16 +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 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG receiver finished"

2015-01-12 16:44:28 +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

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

am 6c93739f: am 9ffb53cb: Clear process DNS NetID binding when expiring or releaseing legacy requests.

2015-01-06 14:57:44 +00:00

nfc

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

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

os

Merge "Clarify docs for user restrictions" into lmp-mr1-dev automerge: 6ab76bd

2015-01-13 17:44:21 +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

Fix race in RecognizerService teardown.

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

test

…

text

am 3ac280c9: am 078ce5fc: Merge "Revert "Change Linkify leniency to VALID"" into lmp-mr1-dev

2014-12-17 23:19:25 +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 9c8f8ed8: am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev

2015-01-05 23:36:57 +00:00

package.html

…