Stephen Hines 846799d693 resolve merge conflicts of f53bfc9 to master ...

Change-Id: Idb454415b166b2ff215c604475dd9129958e7edd

2016-07-21 22:19:07 -07:00

apct-tests/perftests

Double check the layout test running on UI thread

2016-07-12 16:10:45 -07:00

api

ExifInterface: Add ORF file parse support

2016-07-21 13:49:01 +09:00

cmds

Merge \\"Play boot sound on the System stream.\\" into nyc-mr1-dev am: 7d2f4cc750

2016-07-19 19:17:37 +00:00

core

Merge "Fix undefined fontScale issue in Configuration"

2016-07-22 02:44:35 +00:00

data

…

docs

docs: Replacing curly apostrophes with straight ones am: abea4b1dcd

2016-07-21 23:56:50 +00:00

drm

…

graphics

Merge \\"Ensure native allocation/free is correctly registered\\" into nyc-mr1-dev am: a7272b4cad

2016-07-16 00:04:42 +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 \\"Fix a broken case of AndroidKeyStoreProvider error logging\\" into nyc-mr1-dev am: 45b8216d33

2016-07-19 18:01:29 +00:00

libs

resolve merge conflicts of f53bfc9 to master

2016-07-21 22:19:07 -07:00

location

…

media

ExifInterface: Add ORF file parse support

2016-07-21 13:49:01 +09:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "Attempt at fixing broken tests and regressing performance."

2016-07-22 02:04:58 +00:00

proto

Merge \\"Add SETTINGS_CONDITION_NIGHT_DISPLAY\\" into nyc-mr1-dev am: 1e6e1ffeaa

2016-07-20 02:55:03 +00:00

rs

…

samples/training/network-usage

…

sax

…

services

Merge "Fix undefined fontScale issue in Configuration"

2016-07-22 02:44:35 +00:00

telecomm/java

Merge "Enhance toString on ConferenceParticipant." into nyc-mr1-dev

2016-07-18 20:13:32 +00:00

telephony/java

Merge \\"Add carrier config for close connection after MMS request\\" into nyc-mr1-dev am: f2598319c0

2016-07-20 21:28:12 +00:00

test-runner

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

2016-07-20 10:30:57 -07:00

tests

Merge \\"Fix a few log messages that didn\\'t have a space in the SoundTriggerTestApp\\" into nyc-mr1-dev am: ea7999dc3f

2016-07-13 02:15:44 +00:00

tools

Merge "Aapt main dex proguard rules - always keep application"

2016-07-21 09:03:01 +00:00

wifi/java/android/net/wifi

[NAN] Fix TlvElement member names - reflect public access.

2016-07-22 00:30:01 +00:00

Android.mk

Merge \\\"update the version number used in docs and update the offline docs landing page\\\" into nyc-dev am: 6623f4177c am: 38b71c5741

2016-07-18 15:22:05 +00:00

CleanSpec.mk

…

compiled-classes-phone

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%