Elliott Hughes b5ce284aa8 resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp ...

Change-Id: Ic4969a59ef22d4911f74cc1e75ea5ccfab59b770

2014-10-29 12:31:48 -07:00

..

accessibilityservice

APIs for an accessibility service to put interaction tracking overlays.

2014-10-21 14:45:53 -07:00

accounts

…

alsa

…

animation

Added a generic configuration and theme based cache

2014-10-23 11:46:01 -07:00

annotation

…

app

am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev

2014-10-28 18:06:58 +00:00

appwidget

…

bluetooth

Remove spammy log information for BLE scan.

2014-10-18 00:29:57 +00:00

content

Reduce PackageManager RAM usage: ArrayMap/Set.

2014-10-24 12:26:45 -07: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 ddb863f4: am 5b062e07: Merge "CEC: Fix apilint errors." into lmp-mr1-dev

2014-10-24 10:39:50 +00:00

inputmethodservice

…

net

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

2014-10-29 12:31:48 -07:00

nfc

Fix build, previous commit failed to remove an import

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

os

am ebee8a4d: Merge "Replace minimum with maximum in method description." into lmp-mr1-dev

2014-10-28 18:05:09 +00:00

preference

Format ListPreference summary with empty string if entry is null

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

print

…

printservice

…

provider

Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev automerge: 49c1527

2014-10-28 00:27:07 +00:00

security

…

service

Zen: Show "(until 4:56 PM)" in exit conditions.

2014-10-28 12:57:43 -04:00

speech

Fix race in RecognizerService teardown.

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

test

…

text

am 87ce99ca: am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."

2014-10-29 17:13:38 +00:00

transition

Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev

2014-10-27 20:23:28 +00:00

util

am e67b8d28: Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev

2014-10-27 21:33:55 +00:00

view

Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaad

2014-10-28 00:35:14 +00:00

webkit

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

2014-10-13 09:55:22 +00:00

widget

am 87ce99ca: am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."

2014-10-29 17:13:38 +00:00

package.html

…