Raph Levien 1a91d8df50 resolved conflicts for merge of b9d21d62 to master ...

Change-Id: I2936c2a47290c3ea0fc66d460215f9e75d17ebf2

2014-12-08 13:46:15 -08:00

..

accessibilityservice

Move default token handling into WindowManagerImpl

2014-11-19 17:02:16 -08:00

accounts

New AccountManager method to copy accounts between users.

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

alsa

…

animation

Zero duration animations snap to end value when started

2014-12-01 06:57:15 -08:00

annotation

…

app

Merge "MIDI Manager work in progress"

2014-12-08 18:46:38 +00:00

appwidget

…

bluetooth

am 12120998: am e21aafab: am ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user

2014-12-05 21:19:53 +00:00

content

Merge "MIDI Manager work in progress"

2014-12-08 18:46:38 +00: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

Camera2: add toString implementation of LensShadingMap

2014-12-04 15:53:17 -08:00

inputmethodservice

Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting

2014-12-02 16:24:24 -08:00

midi

MIDI Manager work in progress

2014-12-08 10:45:37 -08:00

net

am 180a30aa: am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev

2014-12-04 21:55:38 +00:00

nfc

Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev

2014-11-20 17:59:24 +00:00

os

am 51de927f: am fa99c345: am d537987b: Changing AUDIO_TURNED_ON constant.

2014-12-02 19:45:29 +00:00

preference

Volume: Improve inline volume controls used in settings.

2014-11-28 15:29:21 -05:00

print

Crash apps that print malformed or password protected PDFs.

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

printservice

…

provider

am 180a30aa: am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev

2014-12-04 21:55:38 +00:00

security

…

service

Merge "new SMS/MMS carrier app API" into lmp-mr1-dev

2014-12-04 00:19:06 +00:00

speech

…

test

…

text

resolved conflicts for merge of b9d21d62 to master

2014-12-08 13:46:15 -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

resolved conflicts for merge of 203c8171 to master

2014-12-04 16:06:34 -08:00

webkit

am f1459604: am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache."

2014-11-27 18:09:40 +00:00

widget

am 19623538: am b3b4f837: am 8c9283f4: Merge "Fix NullPointerException in ListView"

2014-12-05 19:48:05 +00:00

package.html

…