Neil Fuller a021e92218 resolved conflicts for merge of 12260ad7 to lmp-mr1-dev-plus-aosp ...

Change-Id: Ie2222794208475216941289cf062e05ca9c75e0f

2014-10-24 11:36:46 +01: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 bd6fabe2: Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev

2014-10-24 02:04:11 +00:00

appwidget

…

bluetooth

Remove spammy log information for BLE scan.

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

content

Added a generic configuration and theme based cache

2014-10-23 11:46:01 -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

Merge "CEC: Fix JavaDoc errors." into lmp-mr1-dev automerge: fa76518

2014-10-24 02:39:34 +00:00

inputmethodservice

…

net

am b9248a55: am b1df48e4: Merge "Add an API to select a network for a DatagramSocket." into lmp-mr1-dev

2014-10-23 22:02:25 +00:00

nfc

Fix build, previous commit failed to remove an import

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

os

am 2ea2bf28: am ed512c81: Merge "Fix issue #17948288: Improve accuracy of memory use reporting" into lmp-mr1-dev

2014-10-18 00:52:07 +00:00

preference

Format ListPreference summary with empty string if entry is null

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

print

…

printservice

…

provider

am b01a5979: am c8a09d54: Merge "Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT." into lmp-mr1-dev

2014-10-23 22:02:59 +00:00

security

…

service

Put in real "code" (aka marketing) name.

2014-10-07 20:17:19 -07:00

speech

Fix race in RecognizerService teardown.

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

test

…

text

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

2014-10-24 11:36:46 +01:00

transition

Use one method to change bounds in ChangeBounds.

2014-10-23 13:08:15 -07:00

util

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

2014-10-24 11:36:46 +01:00

view

am bd6fabe2: Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev

2014-10-24 02:04:11 +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 039cc060: am 82fd8428: Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev

2014-10-23 22:04:28 +00:00

package.html

…