Chad Jones 1fb5528643 resolved conflicts for merge of 57bb5f5c to master ...

Change-Id: Id5dfe7fc919305658312771a031c0764cef5515c

2015-02-23 21:19:58 -08:00

api

Update progress bar and seek bar backgrounds, fix seek bar thumb

2015-02-23 12:49:47 -08:00

cmds

Merge commit '32acf753e8989766f67fd5300d3eb467f707cc79' into HEAD

2015-02-19 14:31:36 -08:00

core

resolved conflicts for merge of 57bb5f5c to master

2015-02-23 21:19:58 -08:00

data

Merge "Move apache specific portions of android.net.http to external/apache-http."

2015-02-13 09:51:44 +00:00

docs

resolved conflicts for merge of 6248cdd5 to master

2015-02-23 14:40:48 -08:00

drm

…

graphics

Merge "Always apply color filter passed to DrawableContainer.setColorFilter"

2015-02-24 01:22:17 +00:00

include

am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev

2015-01-27 23:34:35 +00:00

keystore

am f271fa33: am cdc70256: am f3c117ca: Merge "Add new IKeystoreService methods to KeyStore"

2015-02-24 04:54:41 +00:00

libs

Merge "Fix atrace saveLayer flag logging"

2015-02-24 00:20:08 +00:00

location

Update handling of enum/flag fields in GPS data structures.

2015-02-11 13:16:28 -08:00

media

Add MIDI Manager API tweaks:

2015-02-23 14:32:23 -08:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "Import translations. DO NOT MERGE"

2015-02-23 15:08:30 +00:00

rs

am adb52ef7: Merge "Implement finalizer for RS contexts."

2015-02-20 20:00:40 +00:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of 57bb5f5c to master

2015-02-23 21:19:58 -08:00

telecomm/java

Small update to PhoneAccountHandle ID javadoc.

2015-02-19 22:45:30 -08:00

telephony/java

Add Sub-ID-from-phone-account converter method.

2015-02-19 15:19:16 -08:00

test-runner

…

tests

Fix layer shader to store layer pointer

2015-02-18 17:47:21 +00:00

tools

resolved conflicts for merge of 57bb5f5c to master

2015-02-23 21:19:58 -08:00

wifi/java/android/net/wifi

Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev automerge: d169839 automerge: 0a22d43

2015-01-29 05:04:48 +00:00

Android.mk

Add MIDI Manager API tweaks:

2015-02-23 14:32:23 -08:00

CleanSpec.mk

Split up android.policy into framework.jar and services.jar 1/3

2015-02-10 14:56:02 +01:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove DefaultHostnameVerifier from preloaded-classes.

2014-12-04 09:41:46 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%