Chris Craik 06e7fe5a70 resolve merge conflicts of f2235b6 to master. ...

Change-Id: Ibcef3a37ca0749931d509b53bd52e53a7d30ddbb

2014-11-20 17:27:36 -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 a2b3a75c: am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev automerge: a79d2e8

2014-11-20 21:19:27 +00:00

appwidget

…

bluetooth

am e9f8d1dd: am 2a46722f: Merge "Feature request: Increasing advertise data size on non-connectable adv. When the advertisement is non-connectable, give back the bytes to the advertiser where the adv flags would have been. This increases the non-connectable advertisem

2014-11-15 03:38:12 +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 9b07760d: am 439f17e6: am 76ea69b3: Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev

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

2014-11-19 18:05:33 +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

Fix missing ellipsis when just one character is truncated

2014-11-19 15:39:34 -08:00

transition

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

2014-11-20 15:29:26 +00:00

util

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

2014-11-14 19:17:00 +00:00

view

resolve merge conflicts of f2235b6 to master.

2014-11-20 17:27:36 -08:00

webkit

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

2014-11-14 21:55:52 +00:00

widget

am 8ee7fcd2: am b130d596: Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev automerge: 4247f06

2014-11-20 21:19:17 +00:00

package.html

…