Daniel Nishi 3fd8c801ba resolve merge conflicts of 7145cac to master ...

Change-Id: Idd0a8de30697687309953fd37b568207d2fc0be8

2016-07-06 14:04:36 -07:00

apct-tests/perftests

Add cursor movement perftest.

2016-07-01 13:55:04 +09:00

api

Merge "ExifInterface: Update image length/width values"

2016-07-06 02:33:39 +00:00

cmds

Merge \"Support trimmed images in BootAnimation\" into nyc-mr1-dev

2016-06-30 18:35:43 +00:00

core

resolve merge conflicts of 7145cac to master

2016-07-06 14:04:36 -07:00

data

Merge "Move DownloadsManager to permanent whitelist." into nyc-dev am: 31e3b14d6a

2016-06-01 23:02:47 +00:00

docs

Merge "Docs: Performance final changes" into nyc-dev

2016-07-02 00:15:21 +00:00

drm

…

graphics

Merge \\"Clarify Picture docs on playback\\" into nyc-mr1-dev am: 226b4764b4

2016-07-01 21:17:05 +00:00

include

Move matching Tagalog and Filipino to ResourceTypes.cpp

2016-06-15 11:45:58 -07:00

keystore

Deprecate ACTION_STORAGE_CHANGED

2016-06-30 09:23:15 -07:00

libs

Benchmark-mode for macrobench

2016-07-06 10:50:21 -07:00

location

Docs: Suppress errors in SystemApi Build

2016-06-01 16:13:53 -07:00

media

Merge "Add NonNull and Nullable annotations to MtpDevice."

2016-07-06 06:31:48 +00:00

native

…

nfc-extras

…

obex

Bluetooth: Send GET request as single packet

2016-06-15 23:06:31 +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

resolve merge conflicts of 7145cac to master

2016-07-06 14:04:36 -07:00

proto

Merge \\"Add metrics for toll-free/travel-abroad buttons in Settings\\" into nyc-mr1-dev am: 48c5660c1f

2016-07-01 16:16:31 +00:00

rs

Delete simple reduction implementation.

2016-06-14 14:30:06 -07:00

samples/training/network-usage

…

sax

…

services

Merge \\"Frameworks/base: Refactor UserHandle and Environment a bit\\" into nyc-mr1-dev am: e6fcebbf50

2016-07-06 20:02:44 +00:00

telecomm/java

Merge "Telephony multi-endpoint disconnect causes." into nyc-mr1-dev

2016-07-01 20:23:16 +00:00

telephony/java

Merge \\"Telephony multi-endpoint disconnect causes.\\" into nyc-mr1-dev am: 0babe967be

2016-07-01 20:47:49 +00:00

test-runner

ContextImpl: Keep DisplayAdjustments and Display in sync

2016-06-21 17:55:58 -07:00

tests

Merge "Add test for clip path grouping and intersection"

2016-07-06 16:42:37 +00:00

tools

Merge "AAPT2: Encode empty attribute string values"

2016-07-01 23:33:29 +00:00

wifi/java/android/net/wifi

DO NOT MERGE WifiManager: add WIFI_MODE_NO_LOCKS_HELD

2016-06-28 15:53:46 -07:00

Android.mk

Merge \\"[net mgmt svc] add method to retrieve INetd reference\\" into nyc-mr1-dev am: 58ef88927d

2016-07-06 13:21:51 +00:00

CleanSpec.mk

…

compiled-classes-phone

Frameworks/base: Update compiled-classes-phone

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

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Frameworks/base: Update preloaded-classes

2016-06-06 14:58:44 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%