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

am: af57bd751f

* commit 'af57bd751f9402a54db3cb60dd7c93a8106ae2b0':
  Revert "Fix TextView layout reuse when maxLines is set"

Change-Id: I6c4865dceff4debb17e679a67ffbb3d7eb33f817

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

..

accessibilityservice

…

accounts

…

animation

Merge "Clamp start delay to non-negative range" into nyc-dev am: 54d89e078d am: 0890a4708e

2016-05-25 01:57:48 +00:00

annotation

…

app

Merge commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611'

2016-05-27 20:05:56 +00:00

appwidget

Merge "Maintaining diff for all widget operations instead of just the Views update" into nyc-mr1-dev

2016-05-25 20:45:44 +00:00

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 8de7c95 to master

2016-05-27 16:10:34 -07:00

database

Add missing @Deprecated annotations.

2016-05-24 15:22:55 -07:00

ddm

…

debug

…

gesture

…

hardware

Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am: c396f0f70e

2016-05-26 14:51:30 +00:00

inputmethodservice

Add missing @Deprecated annotations.

2016-05-24 15:22:55 -07: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 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 "Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""" into nyc-mr1-dev am: aabbfc5565

2016-05-27 23:35:36 +00:00

permissionpresenterservice

…

preference

…

print

…

printservice

…

provider

Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657 am: b03e7217f3

2016-05-26 04:34:26 +00:00

security

Use an attribute for the network security config resource

2016-05-19 17:25:41 -07:00

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

Add missing @Deprecated annotations.

2016-05-24 15:22:55 -07:00

transition

Merge "Add missing @Deprecated annotations."

2016-05-25 17:46:40 +00:00

util

stephenli@ manually merge many commits up to '032dcff'

2016-05-19 23:51:32 +00:00

view

Merge "Merge "Update the light center when the root view\'s layout changed" into nyc-dev am: e78ba24c17 am: 56d4dae9ec" into nyc-mr1-dev-plus-aosp

2016-05-27 17:24:49 +00:00

webkit

Add missing @Deprecated annotations.

2016-05-24 15:22:55 -07:00

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

…