Joe Fernandez af74842e3a Resolve merge conflicts of ffb4eb1 to nyc-dev ...

am: a5abfee3a5

Change-Id: I7c4265a691636c1de8b47688cfaa15e57907caee

2016-08-02 21:40:08 +00:00

api

Merge "Add View reveal on focus hint" into nyc-mr1-dev

2016-07-21 21:05:36 +00:00

cmds

bootanimation: fix glitchy playback

2016-07-22 11:31:25 -07:00

core

Merge "Target API check for margin params fix" into nyc-mr1-dev

2016-08-02 20:41:08 +00:00

data

Move DownloadsManager to permanent whitelist.

2016-05-31 17:50:39 -07:00

docs

Merge "AAPT: faketouch feature implied if no touchscreen feature requested." into nyc-mr1-dev

2016-08-02 01:42:37 +00:00

drm

Discourage use of "_data" column.

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

graphics

Eliminate recents upload jank

2016-08-01 16:36:14 -07:00

include

Performance improvements in AssetManager

2016-05-20 15:04:09 -07:00

keystore

Fix a broken case of AndroidKeyStoreProvider error logging

2016-07-15 11:22:25 -07:00

libs

Merge "Ensure layer update include the dirty rect from AVD" into nyc-mr1-dev

2016-08-02 20:36:20 +00:00

location

Fix issue where GnssMeasurements wouldn't allow empty measurements.

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

media

Change AudioRecordingConfiguration constructor parameter order

2016-07-26 14:00:44 -07:00

native

Sensor: Add batch support for native applications

2016-03-16 18:07:00 -07:00

nfc-extras

…

obex

…

opengl/java

update GlSurfaceView:onPause/Resume docs

2016-06-29 14:40:42 -07:00

packages

Merge "Add metrics logging for fingerprint swipe for notification panel." into nyc-mr1-dev

2016-08-02 19:50:07 +00:00

proto

Add metrics logging for fingerprint swipe for notification panel.

2016-08-02 10:25:39 -07:00

rs

Delete simple reduction implementation.

2016-06-02 14:47:12 -07:00

samples/training/network-usage

…

sax

…

services

Merge "ShortcutManager: rescan all apps after next OTA" into nyc-mr1-dev

2016-08-02 20:19:33 +00:00

telecomm/java

Add short string methods for capabilities and properties.

2016-07-26 17:42:38 -07:00

telephony/java

Stop exposing LTE_CA as a rat type.

2016-07-28 20:44:05 -07:00

test-runner

ContextImpl: Keep DisplayAdjustments and Display in sync

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

tests

Work around to get ride of NPE in app startup test

2016-08-01 12:11:57 -07:00

tools

AAPT: faketouch feature implied if no touchscreen feature requested.

2016-08-01 17:20:28 -07: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 \"update the version number used in docs and update the offline docs landing page\" into nyc-dev

2016-07-18 15:07:55 +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

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%