Brian Carlstrom 6422abef78 resolved conflicts for merge of 3bbef521 to master ...

Change-Id: I0bbb7c80f6c4f003779da784475d7acbfb898c94

2014-05-07 14:46:40 -07:00

..

accessibilityservice

Adding system support for a single accessibility focus.

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

accounts

…

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

…

app

Merge "Make Lock Task API public."

2014-05-07 19:18:23 +00: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

resolved conflicts for merge of 3bbef521 to master

2014-05-07 14:46:40 -07:00

database

…

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

…

emoji

…

gesture

…

hardware

Camera: remove some DNG tags

2014-05-07 21:33:23 +00:00

inputmethodservice

Partial revert "Load device default theme mapping from resources"

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

net

Merge "Make proxy API public"

2014-05-07 18:54:12 +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

…

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

Merge "Implement TODO(romainguy)"

2014-05-07 21:24:25 +00: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

…