Jeff Brown ace7404de8 resolved conflicts for merge of d7337fb9 to master ...

Change-Id: I51dedcc5ee521e62ad6101c0b09e4f881b8c4bf0

2012-12-11 15:21:02 -08:00

api

Refactor getPersistedNetworkPreference

2012-12-06 12:00:04 -08:00

cmds

…

core

resolved conflicts for merge of d7337fb9 to master

2012-12-11 15:21:02 -08:00

data

resolved conflicts for merge of d7337fb9 to master

2012-12-11 15:21:02 -08:00

docs

am 81f91ce9: am ecacbd26: am 8642f406: am 9d7578c7: docs: Edit fixes for IABv3 docs.

2012-12-10 11:39:30 -08:00

drm

…

graphics

Add support for Bitmap-backed Allocations in Java.

2012-12-04 18:27:07 -08:00

icu4j

…

include

…

keystore

…

libs

…

location

Move location provider lib to frameworks/ex - 1

2012-12-05 13:57:01 -08:00

media

am bb2985aa: am 683028ca: Merge "Make it clear that non-optional MediaFormat keys are required" into jb-mr1.1-dev

2012-12-06 18:59:53 -08:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

resolved conflicts for merge of d7337fb9 to master

2012-12-11 15:21:02 -08:00

policy

am 5b09fcc7: am 946f6ab4: am 9819a617: Merge "Fix password field focus in keyguard" into jb-mr1.1-dev

2012-12-06 23:22:27 -08:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of d7337fb9 to master

2012-12-11 15:21:02 -08:00

telephony/java

am be5316e0: Merge "Use Rlog"

2012-12-08 13:11:45 -08:00

test-runner

…

tests

Test bounds on rsForEach calls.

2012-12-10 17:45:33 -08:00

tools

am 23307cbb: am e0a676a3: Merge "Fix issue #7649590: Background windows sometimes not being hidden for secondary users" into jb-mr1.1-dev

2012-12-03 16:08:35 -08:00

voip

…

wifi/java/android/net/wifi

Merge "Remove exposing dialog handling to apps"

2012-12-06 13:31:36 -08:00

Android.mk

Move numeric api files from frameworks/base to prebuilts/sdk

2012-12-04 15:12:49 -08:00

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%