fionaxu 1e8fe12f4e resolve merge conflicts of 2c53526 to lmp-mr1-dev ...

am: c196526f8e

Change-Id: Ic0f9fb749282b46d5c41fd36aaab42090ecbd0b9

2016-06-08 16:58:13 +00:00

..

accessibilityservice

Fix broken activation of the selected view in accessibility mode.

2015-02-02 23:17:17 +00:00

accounts

…

alsa

…

animation

Allow infinite-repeat zero-duration animators to continue repeating

2015-01-23 02:07:00 +00:00

annotation

…

app

Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev

2015-05-14 00:40:45 +00:00

appwidget

DO NOT MERGE Don't take flags when creating app widget config activity.

2015-06-01 12:55:38 -07:00

bluetooth

Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev

2015-02-10 00:21:43 +00:00

content

resolve merge conflicts of 2c53526 to lmp-mr1-dev

2016-06-07 22:01:19 -07:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

camera2: Fix legacy scaling factor application.

2015-02-12 13:27:26 -08:00

inputmethodservice

Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting

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

net

Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434

2016-05-26 14:13:16 +00:00

nfc

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

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

os

am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

2015-09-23 11:13:40 +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

Fix NPE

2015-02-17 14:35:37 -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

Avoid static initialization of Layout from TextUtils

2015-02-06 10:29:54 +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 "Add DENSITY_280" into lmp-mr1-dev

2015-02-12 02:08:04 +00:00

view

am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev

2015-05-14 00:51:07 +00:00

webkit

Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.

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

widget

Fix year picker initial range

2015-02-17 21:11:36 +00:00

package.html

…