Alan Viverette 4c05c4c216 Fix fallout from merging e5743753 conflicts ...

Change-Id: Iad16381bdf925a05e2ec609c3a5442c2a0354be9

2015-01-27 16:21:25 -08:00

..

accessibilityservice

Move default token handling into WindowManagerImpl

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

accounts

…

alsa

Watch for NumberFormatExceptions in AlsaCardsParser and AlsaDevicesParser

2015-01-21 11:11:14 -08:00

animation

am af8c621d: Merge "Allow infinite-repeat zero-duration animators to continue repeating" into lmp-mr1-dev automerge: 458cc6a

2015-01-23 18:11:51 +00:00

annotation

…

app

am fff84a23: Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev automerge: aa6945a

2015-01-27 23:30:18 +00:00

appwidget

Fix accessibility delegation

2015-01-07 16:05:02 -08:00

bluetooth

am 76552bb9: am e77adabe: Don\'t compute flags length for scan response

2015-01-23 18:10:40 +00:00

content

Support activities in the same process having different resources.

2015-01-27 07:50:58 -08:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

Camera2: add lens facing EXTERNAL enum

2015-01-23 23:58:45 +00:00

inputmethodservice

Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting

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

midi

MidiManager bug fixing:

2015-01-15 16:07:28 -08:00

net

am 50f9d93a: am ae38596b: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev

2015-01-23 13:05:26 +00:00

nfc

am 3d6cfe0e: am 873b291b: Merge "fix issuse 65774"

2015-01-02 10:34:03 +00:00

os

Merge "check bootimage version string against system"

2015-01-23 20:54:13 +00:00

preference

am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev

2015-01-06 22:22:36 +00:00

print

…

printservice

Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT""

2014-12-29 10:02:28 +00:00

provider

Add Insert.EXTRA_{ACCOUNT,DATA_SET} to API. P #1/2

2015-01-27 00:05:07 +00:00

security

Generate IKeystoreService using aidl

2015-01-13 18:29:15 -08:00

service

Bring back voice interaction APIs.

2015-01-21 15:07:20 -08:00

speech

Add UtteranceProgressListener#onStop callback

2014-12-09 11:06:06 +00:00

test

…

text

am 605ba802: am 2004fdf8: am 830f39ad: Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev

2015-01-16 22:31:38 +00:00

transition

Unhid ChangeScroll

2015-01-05 18:48:49 +00:00

util

am 3d992507: am 09dff843: Merge "Only try to fetch time from NTP if there is a network connection." into lmp-mr1-dev

2015-01-26 22:24:23 +00:00

view

resolve merge conflicts of e5743753 to master.

2015-01-27 15:23:09 -08:00

webkit

Merge "[WebView] Improve documentation around full screen mode."

2015-01-22 10:55:19 +00:00

widget

Fix fallout from merging e5743753 conflicts

2015-01-27 16:21:25 -08:00

package.html

…