Quddus Chong 5dafb34bca resolved conflicts for merge of e470fd85 to lmp-mr1-ub-dev ...

Change-Id: I9ecfa4b7b225f2543bdbdad0f046e9474f1cb47f

2015-04-23 14:30:26 -07:00

api

am f5fa550a: Merge "Move new script group API into ScriptGroup class"

2015-04-22 23:37:06 +00:00

cmds

Explicitly use clang.

2015-04-17 10:40:48 -07:00

core

am 92ae292e: Merge "docs: Add text to JavaDocs regarding browser file access vulnerability" into lmp-mr1-ub-docs

2015-04-23 17:45:19 +00:00

data

Move Noto Sans Tai Le to the end of the font fallback list.

2015-03-12 15:45:32 +00:00

docs

resolved conflicts for merge of e470fd85 to lmp-mr1-ub-dev

2015-04-23 14:30:26 -07:00

drm

Frameworks/base: Wall Werror in drm

2014-11-10 17:23:02 -08:00

graphics

am e2fc3adb: am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc

2015-04-02 20:19:09 +00:00

include

Merge "Fix UB in ResourceTable::stringToInt."

2015-04-14 23:25:27 +00:00

keystore

Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."

2015-04-16 19:50:12 +00:00

libs

Merge "Fix UB in ResourceTable::stringToInt."

2015-04-14 23:25:27 +00:00

location

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

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

media

Merge "Revert "Sometimes the application context is null""

2015-04-22 20:08:38 +00:00

native

Switch libjnigraphics to sysv-only hash style

2015-03-13 12:49:47 -07:00

nfc-extras

…

obex

…

opengl/java

…

packages

Add resources to recyclerview dependency.

2015-04-16 17:58:37 -07:00

policy

am 80f99121: Merge "Prevent infinite layout and wallpaper flashing"

2015-04-21 15:19:06 +00:00

rs

Move new script group API into ScriptGroup class

2015-04-22 15:34:07 -07:00

samples/training/network-usage

…

sax

…

services

am fa147b5c: Merge "[ActivityManager] Move UI operation to UI handler"

2015-04-21 15:53:53 +00:00

telecomm/java

Define the capability to speed up MT call audio

2015-03-17 22:16:52 +00:00

telephony/java

am 74a0eb36: Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev

2015-03-18 23:44:20 +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

Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE

2015-03-31 09:15:40 -07:00

tools

am 1f3c7f3f: am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev

2015-04-16 17:41:54 +00:00

wifi/java/android/net/wifi

Frameworks/base: Fix a hashCode implementation

2015-03-15 14:38:59 -07:00

Android.mk

am 2b92e18b: am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs

2015-04-14 02:44:14 +00:00

CleanSpec.mk

Obliterate LockPatternUtilsCache

2014-11-12 11:31:38 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Load fewer classes when AndroidKeyStore provider is installed.

2015-04-03 12:45:16 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%