Adam Powell ccfa115952 Update mismerged current.txt ...

Change-Id: If16b714ef4cfcdc3c63cf21159390040237a3e78

2014-05-15 15:38:37 -07:00

api

Update mismerged current.txt

2014-05-15 15:38:37 -07:00

cmds

am 1810927a: am eabc93db: am c4c08803: Merge "app_process: change app_process a symlink of primary version"

2014-05-15 10:34:43 +00:00

core

Merge "Ensure volume preference has correct defStyleAttr"

2014-05-15 22:13:36 +00:00

data

update noto fonts

2014-05-13 16:11:11 -07:00

docs

am d850be5d: am 7c05fd85: am 59ab011e: am 0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs

2014-05-15 00:00:53 +00:00

drm

Fix a few more stray libcore.io references.

2014-04-28 20:49:24 -07:00

graphics

Merge "Simplify attribute extraction for themed Drawables"

2014-05-15 20:58:59 +00:00

include

DO NOT MERGE Add DrawGlInfo kModeProcessNoContext

2014-05-01 15:51:41 -07:00

keystore

Use the correct package name for CHOOSER

2014-03-17 16:21:56 -07:00

libs

Animator start value...

2014-05-15 08:53:39 -07:00

location

Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework.

2014-04-25 11:39:16 -07:00

media

camera2: Use StreamConfigurationMap for format/size/duration lookup

2014-05-14 10:40:53 -07:00

native

Bug fix for wakeup sensors.

2014-04-23 17:05:41 -07:00

nfc-extras

…

obex

Fixed review comments

2013-09-12 19:07:28 -07:00

opengl/java

am 43cea7ea: am 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."

2014-04-21 19:49:40 +00:00

packages

Merge "Colorize SystemUI"

2014-05-15 20:39:17 +00:00

policy

Merge "Colorize SystemUI"

2014-05-15 20:39:17 +00:00

rs

am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."

2014-05-08 18:31:18 +00:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

services

Merge "Battery stats more wake history, power save mode."

2014-05-15 21:57:27 +00:00

telecomm/java

Merge "Add toString to CallServiceDescriptor" into master-nova

2014-04-15 18:41:37 +00:00

telephony/java

Merge "Remove obsolete ThirdPartyCall APIs"

2014-05-14 22:08:21 +00:00

test-runner

Initial support for split APKs, PackageInstaller.

2014-05-14 18:12:24 -07:00

tests

Animator start value...

2014-05-15 08:53:39 -07:00

tools

Merge "AAPT dump badging should allow refs in meta-data"

2014-05-15 21:17:33 +00:00

wifi/java/android/net/wifi

autojoin is to eager to black list networks due to connection failure

2014-05-15 20:36:25 +00:00

Android.mk

Merge "Initial support for split APKs, PackageInstaller."

2014-05-15 01:37:35 +00:00

CleanSpec.mk

Make GET_TASKS signature|system.

2014-05-02 11:51:26 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove VideoEditor

2014-04-21 16:11:51 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%