David Christie 975879a18d resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 ...

am: 41a0dd41f1

Change-Id: Ib74b0efa9b9345257d2b3ba59911baa324ec5801

2016-08-24 20:30:01 +00:00

api

DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf

2016-07-07 01:13:47 +00:00

cmds

Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-mr1-dev am: d327d73edf

2016-07-12 19:20:38 +00:00

core

Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-mr1-dev am: f1d9152f9f

2016-07-12 19:20:34 +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

docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

2015-09-08 21:36:54 +00:00

drm

…

graphics

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

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

include

am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

2015-08-21 10:09:22 +00:00

keystore

Merge "frameworks/base: switch to using NativeConstants."

2015-04-24 21:26:14 +00:00

libs

DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev

2015-05-14 07:38:11 -07:00

location

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

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

media

DO NOT MERGE: Fix CTS regression am: 7a92dc9d99

2016-07-29 18:50:25 +00:00

native

Switch libjnigraphics to sysv-only hash style

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

nfc-extras

…

obex

…

opengl/java

…

packages

Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-mr1-dev am: f1d9152f9f

2016-07-12 19:20:34 +00:00

policy

DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de

2015-11-17 20:06:27 +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

resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev

2016-08-23 16:19:51 -07: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

Track change to Conscrypt

2015-03-17 21:27:05 +00:00

tools

DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2

2016-05-19 22:16:42 +00:00

wifi/java/android/net/wifi

Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d

2016-07-20 00:54:27 +00:00

Android.mk

am 4cbe359a: Add \'System\' group to DAC sample browser

2015-05-27 22:22:53 +00:00

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Load ICU4J data on boot

2015-04-23 14:50:34 +01:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%