John Reck 65f2defdfc resolve merge conflicts of cabf8a7 to master. ...

Change-Id: If0ca1c37d05f5dc471d88a3bf158dd68a1880bbf

2014-11-07 11:29:08 -08:00

..

accessibilityservice

Use default token instead of wrapped window manager

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

accounts

…

alsa

…

animation

Cancel animation when target changes.

2014-11-04 07:55:03 -08:00

annotation

…

app

am 675a0b6b: am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev

2014-11-07 04:17:02 +00:00

appwidget

Generalizing Recents widget category to Search box. (Bug 17334589)

2014-09-04 17:13:17 +02:00

bluetooth

Add BluetoothDevice field to BluetoothHeadsetClientCall

2014-11-04 11:37:24 -08:00

content

Fix singleUser provider grants

2014-11-05 15:46:09 -08:00

database

…

ddm

Adds support for Theme dumping via DDM.

2014-09-18 11:29:08 -07:00

debug

…

emoji

…

gesture

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

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

hardware

am 9ae3fe48: am 09035486: Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev

2014-11-05 06:29:24 +00:00

inputmethodservice

…

net

am d9475786: am ea09c7da: Merge "Let scorers fine-tune scoring heuristics." into lmp-mr1-dev

2014-11-07 18:43:23 +00:00

nfc

Fix build, previous commit failed to remove an import

2014-10-07 11:15:58 -07:00

os

am 726715e1: am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev

2014-11-04 02:28:18 +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 ad87ec5b: am cf045ea8: am 803908b0: Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev

2014-11-07 10:14:53 +00:00

security

…

service

Merge "Update TrustAgentService API after review" into lmp-mr1-dev

2014-11-06 02:52:20 +00:00

speech

Fix race in RecognizerService teardown.

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

test

…

text

am 34c45bb9: am b2a6c7b8: am 418f4ed0: Merge "Round charging indication to nearest minute" into lmp-mr1-dev

2014-11-06 16:36:04 +00:00

transition

Fix javadoc.

2014-10-31 17:19:18 -07:00

util

am c56a9d10: am be36ebc2: Merge "Add convenience method for getting the complex unit type" into lmp-mr1-dev automerge: 38d6cf9

2014-10-31 22:13:29 +00:00

view

resolve merge conflicts of cabf8a7 to master.

2014-11-07 11:29:08 -08:00

webkit

am 103817ed: am 4c8dd87a: am 58ee8a96: am 4f3ee426: am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev

2014-10-13 09:59:54 +00:00

widget

am ffa031bb: am e9596818: am aa33a487: Merge "Always update date picker position after change in range" into lmp-mr1-dev

2014-11-05 00:17:32 +00:00

package.html

…