Nicolas Geoffray f95fb4fb17 resolve merge conflicts of 4b092e4 to master ...

Change-Id: I29a92ce3afe3a7b2851126a921879631e9846a40

2016-05-31 13:35:41 +01:00

..

accessibilityservice

…

accounts

…

animation

Merge "Merge "Add more doc for Object animators defined with a single value" into nyc-dev am: f97a0f5c9c" into nyc-mr1-dev am: d01f474773

2016-05-28 01:00:20 +00:00

annotation

…

app

Merge "Fix bad one-line MessagingStyle" into nyc-dev am: 5dbb9ff674 am: d70126ec78

2016-05-28 00:32:56 +00:00

appwidget

…

bluetooth

Merge "Properly check if BT is off when shutting down radios" into nyc-mr1-dev am: 0f760e0815

2016-05-27 19:17:03 +00:00

content

resolve merge conflicts of 4b092e4 to master

2016-05-31 13:35:41 +01:00

database

…

ddm

…

debug

…

gesture

…

hardware

…

inputmethodservice

…

net

Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3 am: 7ff57eaff9 am: 94c8855da6 am: 50615e498e am: fdc53e96d3

2016-05-27 17:42:22 +00:00

nfc

…

os

Merge "Helper method to check if current user is a demo user" into nyc-mr1-dev am: 5df14a60cf

2016-05-27 23:43:10 +00:00

permissionpresenterservice

…

preference

…

print

…

printservice

…

provider

Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev am: efa291a860 am: 8c8ea506d9

2016-05-27 23:43:14 +00:00

security

…

service

Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff am: e6c6ca417d

2016-05-26 16:31:58 +00:00

speech

…

test

…

text

Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev am: fe524c0e24 am: 5f55e2c43d

2016-05-31 01:32:39 +00:00

transition

…

util

…

view

Merge "Close IME when attaching dock stack" into nyc-dev am: c5fc6c602c am: 819cbb3dd3

2016-05-27 23:51:03 +00:00

webkit

…

widget

Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev am: 990e26118d am: 6fe1ab7f21

2016-05-27 23:40:53 +00:00

package.html

…