Chris Craik f2235b6a48 resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp. ...

Change-Id: I1be708f5a0cd4d64021a57f1063d54330f1d2d7e

2014-11-20 16:38:06 -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

Fix seeking and scaled duration behavior

2014-11-19 15:29:47 -08:00

annotation

…

app

am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev

2014-11-20 21:13:10 +00:00

appwidget

…

bluetooth

Feature request: Increasing advertise data size on

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

content

Fix seeking and scaled duration behavior

2014-11-19 15:29:47 -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 439f17e6: am 76ea69b3: Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev

2014-11-19 10:01:51 +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 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev

2014-11-19 17:57:39 +00:00

security

…

service

Adding more javadocs to Carrier messaging API.

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

speech

Fix race in RecognizerService teardown.

2014-10-02 12:10:08 -07:00

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

Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev

2014-11-20 15:29:26 +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

resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp.

2014-11-20 16:38:06 -08:00

webkit

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

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

widget

am b130d596: Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev

2014-11-20 21:10:56 +00:00

package.html

…