Guang Zhu 4297409e45 resolved conflicts for merge of 1e8a87dd to master ...

Change-Id: Id51218b4e2ca06344b5e7596ebde355fba9cfa54

2014-05-07 09:51:11 -07:00

..

accessibilityservice

Adding system support for a single accessibility focus.

2014-04-11 11:21:48 -07:00

accounts

am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.

2014-02-27 11:24:05 -08:00

alsa

Implement USB Audio across Nexus Devices

2014-04-11 12:18:44 -07:00

animation

Doc fix in TypeEvaluator method docs

2014-05-06 17:07:16 -07:00

annotation

Add resource reference annotations

2014-03-27 13:07:00 -07:00

app

Add enableSystemApp methods to DevicePolicyManager

2014-05-07 16:20:38 +01:00

appwidget

Exposing the API to support widgets in Recents.

2014-05-05 14:33:44 -07:00

bluetooth

Add transport param to Connect APIs

2014-05-06 19:20:46 -07:00

content

Add attributes and flags for DocCentric.

2014-05-07 08:41:27 -07:00

database

am df8b604e: Merge "Fix NPE in deleteDatabase()." into klp-modular-dev

2014-01-28 00:13:27 +00:00

ddm

am c6d0dc89: am 18582a82: am 0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS."

2014-04-28 20:03:38 +00:00

debug

Remove unused JNITest class

2014-02-21 14:34:35 +00:00

emoji

Use long for pointers in EmojiFactory and PdfDocument

2014-01-31 12:03:28 +00:00

gesture

…

hardware

Camera2: Add missing capture result tags

2014-05-06 21:46:27 +00:00

inputmethodservice

Partial revert "Load device default theme mapping from resources"

2014-05-05 12:26:03 -07:00

net

am ed23c5bc: Hide NsdServiceInfo additions for KKWT DO NOT MERGE

2014-05-05 22:21:03 +00:00

nfc

Dynamic AID registration APIs for HCE.

2014-04-23 20:21:32 +00:00

os

Add new EDU user restrictions.

2014-05-07 09:51:16 -04:00

preference

Improve Preference highlighting

2014-04-17 19:42:05 -07:00

print

Merge "Update print docs"

2014-03-18 18:00:01 +00:00

printservice

…

provider

First pass at adding FingerprintManagerService

2014-05-07 02:27:21 +00:00

security

…

service

First pass at adding FingerprintManagerService

2014-05-07 02:27:21 +00:00

speech

Add AudioFormat.getBytesPerSample and use it

2014-05-06 09:11:52 -07:00

test

…

text

Merge "Implement better computing of battery drain time, actual charge time."

2014-04-29 18:30:08 +00:00

transition

Add ImageView-specific shared element activity transition code.

2014-05-05 12:25:43 -07:00

tv

Explictly release the surface in TV input framework

2014-04-30 20:05:32 +09:00

util

camera2: Add re-usable data types for camera metadata key/values

2014-05-02 15:55:29 -07:00

view

resolved conflicts for merge of 1e8a87dd to master

2014-05-07 09:51:11 -07:00

webkit

Public WebView permission API

2014-05-06 21:17:54 -07:00

widget

Merge "Fix nested prescrolling bug in ScrollView"

2014-05-06 02:19:35 +00:00

package.html

…