Makoto Onuki 58105199f5 resolve merge conflicts of 25e893c7d5d3 to master ...

Test: build

Change-Id: I43d3eb486d8a6600cfc793d6324b8fe23a241f0f

2017-04-14 17:19:17 -07:00

apct-tests/perftests

Move SystemPerfTest out of java.* namespace

2017-02-28 10:44:04 -08:00

api

resolve merge conflicts of 25e893c7d5d3 to master

2017-04-14 17:19:17 -07:00

cmds

OEM single-build/multi-SKU via dynamic RRO support

2017-04-13 19:33:11 -07:00

core

resolve merge conflicts of 25e893c7d5d3 to master

2017-04-14 17:19:17 -07:00

data

Add Adlam font to fonts.xml

2017-04-13 16:04:47 -07:00

docs

Documentation for PorterDuffXfermode

2017-03-31 18:56:37 -07:00

drm

Properly guard access to CloseGuard in finalizers.

2017-04-03 18:12:04 +01:00

graphics/java/android

Merge "Fix boot loop issue on Android Wear." into oc-dev am: 5f9fde884b

2017-04-14 22:24:34 +00:00

keystore

Fix ACTION_STORAGE_CHANGED doc

2017-03-23 09:26:09 -07:00

legacy-test

Fix build failure when using javac toolchain

2017-02-22 14:42:46 +00:00

libs

Merge "Bug fix: use legacy SkCanvas regardless of color space tag" into oc-dev am: 101dc265a8

2017-04-14 19:02:54 +00:00

location

Merge "Fix some issues came up from the reviews of the newly added APIs Test: Existing unit tests still pass. BUG: 36554361 Change-Id: I6c2dab2e0df7f8578f92c70907f45aa69909892c" into oc-dev am: e425b366ba

2017-04-14 15:30:05 +00:00

media

Merge "TIF: add ASPECT_RATIO_4_3 for Preview/WatchNextPrograms" into oc-dev am: 0cdc7c8874

2017-04-14 18:27:05 +00:00

native

Remove .(ll)ndk suffix from (ll)ndk_library

2017-04-10 12:54:37 -07:00

nfc-extras

Prepare for removal of legacy-test from default targets

2017-01-18 16:39:34 +00:00

obex

OBEX: Set Min maxPacketLength negotiated in CONNECT Operation.

2017-02-03 21:47:39 +00:00

opengl/java

docs: Update gluUnProject parameter description. am: 232c4900ac am: cb6a5fc0f3 am: 94122af913

2017-02-06 21:00:33 +00:00

packages

[DO NOT MERGE] Stop scan on device chooser activity backgrounded

2017-04-14 23:30:46 +00:00

proto

Merge changes from topic 'cp-movies' into oc-dev

2017-04-13 18:39:57 +00:00

rs

[RenderScript] Connect ANativeWindow to BufferQueue before calling

2017-04-04 05:59:19 +00:00

samples/training/network-usage

Remove unnecessary casts on calls to findViewById

2017-04-14 11:15:50 -04:00

sax

Prepare for removal of legacy-test from default targets

2017-01-18 16:39:34 +00:00

services

Merge "Merge "[DO NOT MERGE] Fix associations serialization optimization bug" into oc-dev am: 21da54587b am: 3b3d9f8415"

2017-04-15 00:02:55 +00:00

telecomm/java

Remove handover token.

2017-04-11 09:51:40 -07:00

telephony/java

Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev am: ad989b1711

2017-04-14 17:03:34 +00:00

test-runner

Implement issue #36590595: Add ability to associated a ClipData with JobInfo

2017-03-31 10:41:50 -07:00

tests

Merge "Remove unnecessary casts on calls to findViewById" into oc-dev am: 7c8ab2651b

2017-04-14 18:25:53 +00:00

tools

Merge "AAPT2: Allow the ';' separator on Windows for split args" into oc-dev am: b97d51a0d2

2017-04-14 16:59:07 +00:00

wifi

Properly guard access to CloseGuard in finalizers.

2017-04-03 18:12:04 +01:00

Android.bp

AAPT2: Convert Android.mk to Android.bp

2017-01-13 18:56:55 -05:00

Android.mk

Merge "Service for OEM lock management." into oc-dev am: e52a1bfede

2017-04-14 18:01:24 +00:00

CleanSpec.mk

Clean spec to deal with rename of auto_fill to autofill

2017-03-10 13:02:43 -08:00

compiled-classes-phone

Reorganize font enumeration API.

2017-04-03 13:55:07 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

Move framework-specific portions of pathmap.mk into frameworks/base

2017-03-03 16:18:32 +00:00

preloaded-classes

Reorganize font enumeration API.

2017-04-03 13:55:07 -07:00

PREUPLOAD.cfg

Point to the new checkstyle location for frameworks/base PREUPLOAD hook.

2016-12-15 15:01:36 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%