Mady Mellor d274400205 resolved conflicts for merge of 04f2fe39 to master ...

Change-Id: I9cd9efb3ead33cef9a0de95417d71d535cbc1bce

2015-04-30 16:17:16 -07:00

..

accessibilityservice

…

accounts

[Update API]:

2015-04-28 12:57:28 -07:00

animation

Remove distance based animation duration API

2015-04-23 18:33:39 -07:00

annotation

Merge "Add @RequiresPermission"

2015-04-23 18:36:33 +00:00

app

resolved conflicts for merge of 04f2fe39 to master

2015-04-30 16:17:16 -07:00

appwidget

DO NOT MERGE Don't take flags when creating app widget config activity.

2015-04-20 17:16:38 +00:00

bluetooth

am fb63b682: am 46fa9a96: am 05a419ae: Merge "Temp workaround to track max beacons." into mnc-dev

2015-04-30 15:34:51 +00:00

content

Merge "ActionBar SearchView's default hint shouldn't override SearchableInfo" into mnc-dev

2015-04-30 15:59:21 +00:00

database

am 5b0c0964: am fb861b6c: am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"

2015-04-22 00:23:51 +00:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev

2015-04-30 18:10:31 +00:00

inputmethodservice

Notify IME visibility when showWindow is called.

2015-04-24 13:17:03 -07:00

net

Fix incorrect javadoc for Uri.getQueryParameter.

2015-04-30 12:23:19 +01:00

nfc

Add NFC APIs for dynamic resources.

2015-04-22 11:56:36 +02:00

os

Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp" into mnc-dev

2015-04-30 17:53:51 +00:00

preference

Volume: Automute in seek bar volumizer.

2015-04-16 11:01:15 -04:00

print

…

printservice

…

provider

Zen: New event condition data model.

2015-04-30 11:42:11 -04:00

security

Add missing error codes from keymaster_defs.h.

2015-04-29 23:13:20 -06:00

service

Zen: New event condition data model.

2015-04-30 11:42:11 -04:00

speech

Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate

2015-04-27 16:17:24 -07:00

test

…

text

Merge "Enable mouse drag text selection for unfocused TextView."

2015-04-20 04:49:50 +00:00

transition

Make sure Transition constructor is accessible before invoking

2015-04-28 14:17:06 -07:00

util

Add float support to binary event log.

2015-04-28 17:53:32 -07:00

view

resolved conflicts for merge of 04f2fe39 to master

2015-04-30 16:17:16 -07:00

webkit

Merge "Add system API method for loading webview library from another package."

2015-04-24 09:27:19 +00:00

widget

am 68999a74: am 19b9f8ef: am 8310f87d: Merge "ActionBar SearchView\'s default hint shouldn\'t override SearchableInfo" into mnc-dev

2015-04-30 16:25:24 +00:00

package.html

…