smain@google.com bf7ab6a90c resolve merge conflicts of e8a3ea8 to nyc-mr1-dev-plus-aosp ...

am: 151833ab14

Change-Id: Icbde16bb62da630836fe908fa7ca088fe95701ba

2016-09-01 01:26:48 +00:00

apct-tests/perftests

Workaround the issue that parameterized test don't support @UiThreadTest

2016-08-30 15:06:28 -07:00

api

Merge "java.security.Principal: add default method Principal#implies" am: 0c8c4a5d98 am: e639bbd7d0 am: 61c0996d6f

2016-09-01 01:18:28 +00:00

cmds

Revert "DO NOT MERGE Revert "Add WiFi toggle prompts - framework""

2016-08-31 16:11:03 -07:00

core

Merge "Fix receive timeout on LocalSocket" am: 7a9c0cd854 am: 680ec020a1 am: ef1fb4889a

2016-09-01 01:18:32 +00:00

data

Fix alarm Bounce: remove DC offset at beginning am: bcbb5c4e07 am: a833e1ca30

2016-08-24 23:53:13 +00:00

docs

docs: Fix broken camera example am: 3f97bc25d4

2016-08-30 18:45:24 +00:00

drm

Discourage use of "_data" column.

2016-01-06 10:19:35 -07:00

graphics

Fail createVirtualDisplay with single-buffered Surface am: aff2f94939 am: d387b20dcb

2016-08-31 02:56:35 +00:00

include

Merge \\\\"Handle long process names correctly.\\\\" am: e2994438d2 am: d5a72fae4a am: ea9616e48e

2016-07-19 00:45:29 +00:00

keystore

Merge "Handle null packageName in PendingIntentRecord" into nyc-mr1-dev am: 6acd5e7361 am: 2f6eecbed0

2016-08-23 22:29:15 +00:00

libs

Merge "Fix google-explicit-constructor warnings in libs/hwui." am: 7207562ff7 am: d7a69e04eb am: 842f1e48e7

2016-09-01 01:26:40 +00:00

location

Fix issue where GnssMeasurements wouldn't allow empty measurements.

2016-07-07 14:07:48 -07:00

media

Merge "Fix google-explicit-constructor warnings in media/mca." am: 2cace65f71 am: 4836d07980 am: edd824b94a

2016-09-01 01:26:36 +00:00

native

Merge "Enable clang for arm64."

2016-08-04 17:19:10 +00: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

Adds a section for unaccounted data. am: 54dc9edc52 am: e2e58543a0

2016-09-01 01:11:19 +00:00

proto

Add metrics for fragments in Settings.

2016-08-18 13:41:57 -07:00

rs

Merge \\"Delete simple reduction implementation.\\" into nyc-dev am: d749245b88

2016-06-13 22:20:32 +00:00

samples/training/network-usage

…

sax

…

services

resolve merge conflicts of a2c1196 to master - continued

2016-08-31 18:09:00 -07:00

telecomm/java

Update InCallService#onConnectionEvent comments.

2016-08-29 21:45:04 +00:00

telephony/java

Add device config to determine when "allow hold" carrier config is used. am: d81c426e1d am: 6c619a2abb

2016-08-31 00:35:44 +00:00

test-runner

Merge "Revert "Add per-user versions of set{Component,Application}EnabledSetting.""

2016-08-02 23:56:55 +00:00

tests

Manually merge commit 'b0b6afc' into nyc-dev-plus-aosp

2016-08-30 00:26:21 +00:00

tools

Merge "AAPT2: Revert warning when merging packages"

2016-08-31 20:18:19 +00:00

wifi/java/android/net/wifi

Revert "DO NOT MERGE Revert "Add WiFi toggle prompts - framework""

2016-08-31 16:11:03 -07:00

Android.mk

resolve merge conflicts of e8a3ea8 to nyc-mr1-dev-plus-aosp

2016-09-01 01:26:48 +00:00

CleanSpec.mk

Fix incremental build

2016-03-03 10:19:27 -08:00

compiled-classes-phone

Frameworks/base: Update compiled-classes-phone

2016-06-07 03:12:03 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Merge "Ensure apps cannot prevent uncaught exceptions being logged."

2016-08-09 09:02:27 +00:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%