Jack Yu 82c46d11f6 resolve merge conflicts of e091985bb5 to stage-aosp-master ...

Test: Manual
Change-Id: Icaf4663abd3ad233afa3e31ff1939dbb7c07a2a5

2017-02-24 18:47:01 -08:00

..

accessibilityservice

…

accounts

Fix @links in reference docs. am: 54de77470d

2017-01-26 04:39:57 +00:00

animation

…

annotation

…

app

Merge "Add isBundled argument to LoadedApk.makePaths call"

2017-02-23 23:30:16 +00:00

appwidget

Fix @links in reference docs.

2017-01-25 17:00:55 -08:00

bluetooth

Merge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62

2017-02-07 00:10:21 +00:00

content

Merge "move ACTION_CARRIER_SETUP intent to public api"

2017-02-25 01:12:09 +00:00

database

…

ddm

…

debug

…

gesture

…

hardware

Merge "camera case fail for testSceneModes" am: b59cd66e93 am: a22c40839e

2017-02-16 21:53:23 +00:00

inputmethodservice

Fix @links in reference docs.

2017-01-25 17:00:55 -08:00

net

Merge "Update UpstreamNetworkMonitor to use custom Handlers"

2017-02-24 08:15:19 +00:00

nfc

nfc: Make NDEF validation stricter

2017-01-25 18:21:28 +00:00

os

Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: 05dfd10254 am: db0803b4e8

2017-02-16 23:37:48 +00:00

permissionpresenterservice

…

preference

Merge "Fix the "Alarm volume" icon is displayed incorrectly"

2017-02-16 12:47:43 +00:00

print

…

printservice

…

provider

resolve merge conflicts of e091985bb5 to stage-aosp-master

2017-02-24 18:47:01 -08:00

security

…

service

Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" am: ff1d8da55e

2017-02-06 15:47:39 +00:00

speech

…

text

Merge "Load hyphenation patterns for Bulgarian and Church Slavonic"

2017-02-24 19:45:28 +00:00

transition

…

util

Merge "Add Binder support for Parcelable exceptions." am: a2ef6b5741

2017-01-20 22:56:45 +00:00

view

Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be77a am: 9e99b9ee45

2017-02-08 20:18:34 +00:00

webkit

Merge "Add isBundled argument to LoadedApk.makePaths call"

2017-02-23 23:30:16 +00:00

widget

Merge "Don't scroll popup parent in response to parent scrolling" into nyc-mr2-dev

2017-02-10 18:43:47 +00:00

package.html

…