Jim Miller 0ac8dfa37b Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev ...

automerge: ffd1a49

* commit 'ffd1a49c0b8e442aea73c4f5336ea486492981f6':
  Clarify getTrustAgentConfiguration() documentation.

2015-01-22 02:40:15 +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

Clarify getTrustAgentConfiguration() documentation.

2015-01-21 21:01:02 +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

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

2015-01-16 18:36:45 +00:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

Mark TimeUnit as @SystemApi

2015-01-21 07:33:40 +09:00

inputmethodservice

Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting

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

net

Rerun entitlementcheck on sim change.

2015-01-14 16:55:38 -08:00

nfc

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

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

os

Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev

2015-01-15 12:28:13 +00:00

preference

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

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

print

…

printservice

…

provider

Add global setting for ephemeral network timeout.

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

security

…

service

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

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

speech

…

test

…

text

Fixing a memory leak: activities are leaked.

2015-01-16 18:14:36 +00: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

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

2015-01-13 19:01:24 +00:00

webkit

Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.

2015-01-07 15:13:48 +00:00

widget

Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev

2015-01-15 22:25:08 +00:00

package.html

…