Robert Greenwalt 538cdb98ef resolved conflicts for merge of 85b5e4c4 to master ...

Change-Id: Idd0ad9b1504fddf68c4c4cc04731de1eddd204b3

2013-07-19 14:09:30 -07:00

api

Merge "LocalSocket: Add support for SOCK_DGRAM and SOCK_SEQPACKET"

2013-07-19 17:39:28 +00:00

cmds

Remove dead code in system server initialization.

2013-07-15 15:08:39 -07:00

core

resolved conflicts for merge of 85b5e4c4 to master

2013-07-19 14:09:30 -07:00

data

am a8f7659a: am f65c9189: am bbc9a62a: Cleaner Tejat notification in Audio Package 11

2013-07-19 13:42:39 -07:00

docs

am 0f33e44f: am 0987ff87: Merge "Add Flo to device art generator." into jb-mr2-dev

2013-07-19 13:37:28 -07:00

drm

Add liblog

2013-04-09 21:54:12 -07:00

graphics

Merge "Add reconfigure method to Bitmap"

2013-07-18 22:55:44 +00:00

include

Move input library code to frameworks/native.

2013-07-01 20:11:42 -07:00

keystore

resolved conflicts for merge of fca0f92e to stage-aosp-master

2013-06-28 16:41:19 -07:00

libs

Merge "Support stencil-based clipping for functors"

2013-07-16 22:43:02 +00:00

location

Use FastPrintWriter... everywhere.

2013-06-24 18:16:48 -07:00

media

Add FX_KEYPRESS_INVALID constant to AudioManager.

2013-07-18 10:46:19 -07:00

native

Move input library code to frameworks/native.

2013-07-01 20:11:42 -07:00

nfc-extras

Clean up dist files.

2013-05-21 12:38:22 -07:00

obex

…

opengl/java

Merge "Fix wrapper equals()"

2013-06-24 17:42:25 +00:00

packages

Merge "Import translations. DO NOT MERGE"

2013-07-19 17:19:20 +00:00

policy

Merge "Add a keycode to switch audio tracks (1/2)"

2013-07-16 01:38:46 +00:00

samples/training/network-usage

cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2

2012-08-08 11:27:09 -07:00

sax

…

services

resolved conflicts for merge of 85b5e4c4 to master

2013-07-19 14:09:30 -07:00

telephony/java

Merge "Add carrier setup app integration"

2013-07-15 18:31:20 +00:00

test-runner

Single-user restrictions

2013-06-25 16:03:55 -07:00

tests

Fix minor transition bugs and add capabilities

2013-07-12 13:40:38 -07:00

tools

am 388f85eb: am a2f41b23: am bf8be2ee: Merge "Add orientation to configuration for layoutlib." into jb-mr2-dev

2013-07-19 13:42:34 -07:00

wifi/java/android/net/wifi

wifi: Add tdls_discover command to tdls enable call

2013-07-16 12:41:22 -07:00

Android.mk

Split framework jar.

2013-07-17 21:11:33 -07:00

CleanSpec.mk

Add a clean spec rule due to renamed *.aidl

2013-07-16 13:49:44 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Enable preloading of the appropriate WebView.

2013-06-19 15:03:08 +01:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%