Tao Bao 6d8886ac46 resolved conflicts for merge of e1e1cd9d to lmp-mr1-dev-plus-aosp ...

Change-Id: If01cb9c91c4f980d422896aa5ebe713f540d4fd1

2015-02-11 22:32:05 -08:00

api

am b73e029f: am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev

2015-02-12 02:25:29 +00:00

cmds

am f7049289: am 3812e68e: Merge "kill HAVE_PTHREADS."

2015-01-27 07:04:55 +00:00

core

resolved conflicts for merge of e1e1cd9d to lmp-mr1-dev-plus-aosp

2015-02-11 22:32:05 -08:00

data

Merge "Add 8 more scripts to the font fallback chain." into lmp-mr1-dev

2014-12-05 07:27:33 +00:00

docs

am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs automerge: 696b68c

2015-02-10 20:50:57 +00:00

drm

…

graphics

am 94474515: Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev

2015-01-23 20:33:18 +00:00

include

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

2015-01-27 18:33:46 +00:00

keystore

Merge "Remove DSA support from Android KeyStore and KeyChain."

2015-01-16 16:44:22 +00:00

libs

am af6eaf65: Merge "Fix ANR caused by hwuiTask thread" automerge: 5ad36d4

2015-02-04 22:08:27 +00:00

location

am a4c40c37: am 72d33849: Merge "Missing break in switch statement"

2014-12-30 12:29:38 +00:00

media

am 6da3cc59: am 396f131d: Merge "Fix memory leak"

2015-02-11 00:00:57 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Doze: pulse less often. automerge: 618e420

2015-02-10 17:40:33 +00:00

policy

am 1d97aa4d: Merge "Allow single press of physical button to go home without sleeping." into lmp-mr1-modular-dev

2015-02-07 00:39:18 +00:00

rs

am 2a3cdf57: Merge "Implement array types"

2015-02-10 01:44:11 +00:00

samples/training/network-usage

…

sax

…

services

am b0dfaad8: am f99551d8: am c7ccc393: Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev

2015-02-12 03:09:57 +00:00

telecomm/java

Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev

2015-02-02 15:48:53 +00:00

telephony/java

GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8

2015-02-11 03:44:42 +00:00

test-runner

am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev

2014-11-21 00:43:51 +00:00

tests

am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev

2015-01-14 20:47:47 +00:00

tools

am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev

2015-02-10 20:14:44 +00:00

wifi/java/android/net/wifi

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

2015-01-29 05:00:44 +00:00

Android.mk

am 301e1def: am 24328660: Merge "Check in "current" system API files." into lmp-mr1-dev

2015-01-22 20:47:22 +00:00

CleanSpec.mk

…

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%