John Reck 4a3b0c7587 resolve merge conflicts of 24e38ab to stage-aosp-master ...

Change-Id: I25844e17d2d6371ed786833c756051d19d0abec4

2016-08-22 15:13:01 -07:00

apct-tests/perftests

Introduce TextPaint.measureText performance tests.

2016-08-09 18:41:52 +09:00

api

Merge "Add ViewConfiguration.getScaledScrollFactor()"

2016-08-18 21:16:49 +00:00

cmds

Merge "Remove unused includes." am: 35da832634 am: 33e65232f3 am: eb349448aa

2016-08-18 03:36:21 +00:00

core

Merge "Remove EXTRA_SHOW_FILESIZE."

2016-08-22 21:43:16 +00:00

data

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

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

docs

Doc change: intl page updates for final n release. am: e816f1f542

2016-08-22 19:06:35 +00:00

drm

Discourage use of "_data" column.

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

graphics

Only have a single call into pdfium at a time.

2016-08-18 18:20:59 +00:00

include

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

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

keystore

Fix @link tags in keystore doc am: 3f0526ea09 am: 9e8b4ad9c9

2016-08-09 19:43:17 +00:00

libs

resolve merge conflicts of 24e38ab to stage-aosp-master

2016-08-22 15:13:01 -07:00

location

Fix issue where GnssMeasurements wouldn't allow empty measurements.

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

media

Merge changes from topic 'Different sound settings for work profile'

2016-08-19 17:02:05 +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

DO NOT MERGE: Don't delete source file when a move opration is canceled am: 682d370390

2016-08-20 00:29:41 +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

Merge "Fix "can't create user" failure"

2016-08-22 21:53:18 +00:00

telecomm/java

Add connection events for indicated when a connection is remotely held.

2016-08-17 13:48:27 -07:00

telephony/java

Add Telephony Connection event for handover from WIFI to LTE. am: 481255dc1c am: 984a1efd2a

2016-08-18 01:04:11 +00:00

test-runner

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

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

tests

Add TouchLatency test

2016-08-08 13:32:34 -07:00

tools

Re-enable disabled emoji tests [DO NOT MERGE] am: 8cd1b1ba80

2016-08-19 22:48:15 +00:00

wifi/java/android/net/wifi

[NAN] Add method to ConfigRequest to determine if non-default

2016-08-19 23:28:43 +00:00

Android.mk

dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links. am: b042ab1eb6 am: d66ec65b77 am: 7e7ea76356

2016-08-18 01:13:32 +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

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%