Mark Salyzyn db15537e6e resolve merge conflicts of 082a1721b516 to master ...

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I17f178f425975c1c0dbd48091d25b101956d505e

2017-01-11 08:30:17 -08:00

apct-tests/perftests

…

api

Merge "Introduce full justification."

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

cmds

…

core

resolve merge conflicts of 082a1721b516 to master

2017-01-11 08:30:17 -08:00

data

…

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

resolve merge conflicts of 082a1721b516 to master

2017-01-11 08:30:17 -08:00

location

…

media

resolve merge conflicts of 082a1721b516 to master

2017-01-11 08:30:17 -08: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 082a1721b516 to master

2017-01-11 08:30:17 -08: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

…

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

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

PREUPLOAD.cfg

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%