Adam Powell 3df1a1da42 resolved conflicts for merge of d8435643 to lmp-mr1-dev-plus-aosp ...

Change-Id: Ic4669691dd50e400d79e1bc1e54d2e53bcd35a56

2014-11-18 16:12:28 -08:00

..

accessibilityservice

Use default token instead of wrapped window manager

2014-11-04 17:40:29 -08:00

accounts

New AccountManager method to copy accounts between users.

2014-11-14 11:09:27 +00:00

alsa

…

animation

Remove unnecessary reflection lookup in Animators.

2014-11-11 08:51:53 -08:00

annotation

…

app

am 0af82f65: am 0925db87: Merge "Rename the dont_disable_system_apps constant." into lmp-mr1-dev

2014-11-18 19:35:24 +00:00

appwidget

…

bluetooth

Feature request: Increasing advertise data size on

2014-11-15 02:25:05 +00:00

content

Explicitly bind AsyncTask to main looper.

2014-11-14 17:22:31 -08:00

database

…

ddm

…

debug

…

emoji

…

gesture

am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references"

2014-10-17 14:59:48 +00:00

hardware

am 438f54db: am bad677f3: Merge "Camera2: Add BURST_CAPTURE capability flag" into lmp-mr1-dev

2014-11-17 19:31:50 +00:00

inputmethodservice

…

net

am 0e784874: am 9a1da68b: Expose a SystemApi method to prepare a VPN without consent.

2014-11-18 02:05:29 +00:00

nfc

Add UserHandle to BeamShareData

2014-11-03 11:44:10 -08:00

os

am 7ff92f42: am 9522055f: Merge "Add time estimates to batterystats dump." into lmp-mr1-dev

2014-11-18 18:51:50 +00:00

preference

Format ListPreference summary with empty string if entry is null

2014-10-21 17:05:07 -07:00

print

Crash apps that print malformed or password protected PDFs.

2014-11-01 00:06:08 +00:00

printservice

…

provider

am 7ff92f42: am 9522055f: Merge "Add time estimates to batterystats dump." into lmp-mr1-dev

2014-11-18 18:51:50 +00:00

security

…

service

Adding more javadocs to Carrier messaging API.

2014-11-14 14:45:51 -08:00

speech

…

test

…

text

am 22e8e8ef: am bde9ffbd: Merge "Fix missing ellipsis when just one character is truncated" into lmp-mr1-dev

2014-11-18 22:25:39 +00:00

transition

Fix Visibility transitions canceling when nothing has changed.

2014-11-14 21:02:42 +00:00

util

am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev

2014-11-14 00:03:16 +00:00

view

am 51ce9cac: am 37cdc191: Merge "Don\'t invalidate() on setClipBounds" into lmp-mr1-dev

2014-11-18 21:51:40 +00:00

webkit

am 27936ad3: Merge "Block loading WebView in privileged processes." into lmp-mr1-dev

2014-11-14 21:47:17 +00:00

widget

resolved conflicts for merge of d8435643 to lmp-mr1-dev-plus-aosp

2014-11-18 16:12:28 -08:00

package.html

…