Neil Fuller 505d8262ab resolve merge conflicts of 46c39f6c36 to master ...

Change-Id: Ica5ee627b6884800ad3be172f5d2d10b6ba02052

2017-01-11 16:15:13 +00:00

apct-tests/perftests

…

api

Merge "Introduce full justification."

2017-01-11 08:24:08 +00:00

cmds

media volume: remove old --set and rename --index to --set

2016-12-22 00:18:50 +00:00

core

Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524 am: f4e236c794 am: 43d53395dc

2017-01-11 15:45:29 +00:00

data

Add font descriptions for six more scripts to fonts.xml

2016-12-19 15:19:35 -08:00

docs

Merge "Use half-width quotes in code example." am: 1fe99a819c am: 161d1487ba am: 2cb75e822d

2017-01-05 22:14:22 +00:00

drm

…

graphics

Merge "Remove clipRegion from the public API."

2017-01-09 18:01:50 +00:00

keystore

…

legacy-test

…

libs

Merge "Fix a use-of-uninitialized-value warning." am: 95ef9ec5b1 am: 44e14d0d2b am: 5f3ed9b7de

2017-01-11 01:41:03 +00:00

location

Removing @removed methods and constants

2016-12-23 13:18:16 -08:00

media

Merge changes from topics 'List parent profile custom ringtones from managed profile', 'Add/delete custom ringtones from storage'

2017-01-06 19:35:59 +00:00

native

Unversion NDK stub libraries.

2017-01-06 11:04:14 -08:00

nfc-extras

…

obex

…

opengl/java

Provide non-blocking SurfaceView draw notification path.

2017-01-09 10:44:58 -08:00

packages

Merge "Fixes for FlashlightTile lifecycle"

2017-01-11 16:02:54 +00:00

proto

Merge "Add Brightness setting for VR Mode."

2017-01-11 03:02:02 +00:00

rs

…

samples/training/network-usage

…

sax

…

services

resolve merge conflicts of 46c39f6c36 to master

2017-01-11 16:15:13 +00:00

telecomm/java

Adding extra key to indicate when the last emergency call was made.

2017-01-10 20:56:23 +00:00

telephony/java

Merge "Fix naming of key" am: 0b74a1dabb am: c68c2f6885

2017-01-10 23:55:55 +00:00

test-runner

Make sure ServiceConnection callback is called in main thread

2016-12-29 14:07:46 +00:00

tests

Merge "Create a new jank test to measure HW layer resize performance"

2017-01-09 18:50:56 +00:00

tools

Merge "Call onApplyWindowInsets after requestApplyWindowInsets"

2017-01-11 15:57:15 +00:00

wifi

Expose fields in WifiConfiguration.

2017-01-09 18:47:46 +00:00

Android.bp

…

Android.mk

YAMAFFR - Yet Another Major AutoFill Framework Refactoring

2017-01-10 12:50:47 -08:00

CleanSpec.mk

…

compiled-classes-phone

Merge "Add a mechanism for configuring the A2DP Source codecs" am: 63270f2b96 am: 8b46f87e7e am: da3de76bdb

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

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Move ContextHubService to a better location.

2016-12-21 11:33:28 -08:00

PREUPLOAD.cfg

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%