Jack Yu 8d3d0ce93a resolve merge conflicts of 80a0e6d to nyc-mr2-dev-plus-aosp ...

am: cba59432ba  -s ours

Change-Id: I081ed5a1b6b85dea57a1a55a8e3f41b0ecaf974f

2016-11-18 17:30:47 +00:00

apct-tests/perftests

Merge "Add more complex View inflation bench"

2016-11-17 22:06:27 +00:00

api

Merge "Phase-2 API takes a hostname"

2016-11-17 20:39:54 +00:00

cmds

DO NOT MERGE ANYWHERE Add supports-multiwindow command to am.

2016-11-17 23:16:36 +00:00

core

Split libhidl into base and transport.

2016-11-18 15:15:32 +00:00

data

Control privileged permissions for priv-apps

2016-11-14 18:06:15 -08:00

docs

App Shortcut: Clarify which attributes must be resources am: 104f805337 am: 2a3fe7d979 am: b0fd5ba122

2016-11-11 23:54:51 +00:00

drm

Stop including libcore/include/ in most of frameworks/base.

2016-09-15 13:13:39 -07:00

graphics

Merge "Add wordSpacing parameter to Paint"

2016-11-17 08:00:01 +00:00

include

Move one more libandroidfw header

2016-11-04 15:49:43 -07:00

keystore

Test for null context in getPrivateKey

2016-11-16 06:06:36 -07:00

libs

Merge "Remove obsolete interface GetTable."

2016-11-18 02:17:31 +00:00

location

Move dump() to dumpAsync(), more oneway calls.

2016-11-09 12:25:48 -07:00

media

Merge "Fix wrong JavaDoc parameter names of ExifInterface.getJpegAttributes()"

2016-11-17 04:49:12 +00:00

native

Re-unite sources with their headers

2016-11-04 13:27:37 -07:00

nfc-extras

…

obex

Allow getResponseCode to block if response hasn't been received from remote

2016-08-22 18:25:14 +00:00

opengl/java

Merge \"Merge \\"update GlSurfaceView:onPause/Resume docs\\" into nyc-mr1-dev am: ee557b2b99\" into nyc-mr1-dev-plus-aosp

2016-07-01 22:09:47 +00:00

packages

Merge "Fix TTS for GMT offset"

2016-11-18 03:36:52 +00:00

proto

TRON logging for TextView gesture - Long press.

2016-11-17 10:51:26 +00:00

rs

Merge "Rely on the platform -std default."

2016-10-08 21:45:16 +00:00

samples/training/network-usage

…

sax

…

services

Split libhidl into base and transport.

2016-11-18 15:15:32 +00:00

telecomm/java

Merge "Readability improvements in Logging" am: d51df736f6 am: 90b6e78657 am: 3ae84b6efe

2016-11-17 19:51:28 +00:00

telephony/java

Added configuration for VT downgrade/tear down when data disabled

2016-11-17 10:42:02 -08:00

test-runner

Wire up PM.getInstalledApplicationsAsUser(flags, userId) as hidden API

2016-11-17 20:49:16 +01:00

tests

Update usage of ActivityManagerNative.

2016-11-14 11:27:12 -08:00

tools

Wire up PM.getInstalledApplicationsAsUser(flags, userId) as hidden API

2016-11-17 20:49:16 +01:00

wifi

Merge "wifi: hotspot2: add support for validating passpoint configuration" am: ebb722d04a am: 8bbb583ff7 am: 1b3a17c280

2016-11-18 09:10:43 +00:00

Android.bp

Move libjnigraphics to ndk_library.

2016-09-27 13:59:05 -07:00

Android.mk

Rename MountService to StorageManagerService.

2016-11-15 12:43:37 -08:00

CleanSpec.mk

Rename MountService to StorageManagerService.

2016-11-15 12:43:37 -08:00

compiled-classes-phone

Rename MountService to StorageManagerService.

2016-11-15 12:43:37 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Rename MountService to StorageManagerService.

2016-11-15 12:43:37 -08:00

PREUPLOAD.cfg

Check USB and Print Framework code.

2016-10-20 17:27:48 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%