Robert Greenwalt 673c910ddd resolved conflicts for merge of 5192ea2b to master ...

Change-Id: I011b18d19749cdadfa39fa3b5a41ca9d588d0506

2014-06-11 13:29:41 -07:00

api

am 40c042b8: Merge "Hide the (obsolescent) android.app.maintenance APIs" into lmp-preview-dev

2014-06-11 17:43:20 +00:00

cmds

Merge "Add an --abi argument to "pm install""

2014-06-03 12:01:53 +00:00

core

am 44195b4f: am 42c53fd6: Merge "Catch OperationUnsupportedException when linkifying using WebView" into klp-modular-dev

2014-06-11 19:33:46 +00:00

data

am eb77dfe1: Merge "Fix broken macStyle flags on Roboto-MediumItalic" into lmp-preview-dev

2014-06-05 20:08:55 +00:00

docs

am b1cb5aab: am 748856f2: am a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore

2014-06-11 19:33:51 +00:00

drm

am 5fed49f7: am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev

2014-06-10 01:30:05 +00:00

graphics

resolved conflict for merge of 3ca33b70 to master

2014-06-11 15:02:55 +02:00

include

camera2: Plumb DngCreator to native library.

2014-05-16 23:25:51 -07:00

keystore

am b1cb5aab: am 748856f2: am a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore

2014-06-11 19:33:51 +00:00

libs

am b1c76a1a: Merge "Tessellate on worker threads" into lmp-preview-dev

2014-06-10 17:22:31 +00: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

am 6580a31d: Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev

2014-06-09 19:29:58 +00:00

native

Remove getRequiredPermission from NDK.

2014-06-05 22:24:57 +00:00

nfc-extras

…

obex

Fixed review comments

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

opengl/java

opengl: Un-hide GLES31 and GLES31Ext classes

2014-05-21 21:04:20 -07:00

packages

fixbuild: Remove 'pinned' attr.

2014-06-11 11:56:58 -07:00

policy

Use META_LEFT to launch the ASSIST behavior.

2014-06-05 21:00:53 +00:00

rs

am b43bc047: Merge "Change flags to use int instead of long." into lmp-preview-dev

2014-06-06 22:41:22 +00:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

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

services

am 34852095: Merge "Don\'t enable Ethernet on the emulator." into lmp-preview-dev

2014-06-11 17:43:15 +00:00

telecomm/java

API: Add call service handoff trigger

2014-06-06 11:27:43 -07:00

telephony/java

Rename PrivateApi annotation to SystemApi. (DO NOT MERGE)

2014-06-09 14:28:11 -07:00

test-runner

Merge "Add ArrayUtils methods and tests for consumption by KeySet code."

2014-06-02 17:34:09 +00:00

tests

am d8f71d34: Merge "Out with the old; in with the new" into lmp-preview-dev

2014-06-11 17:02:18 +00:00

tools

am e3e1591c: Merge "Remove lxml dependency." into lmp-preview-dev

2014-06-11 17:43:36 +00:00

wifi/java/android/net/wifi

remember and report network score

2014-06-09 14:50:47 -07:00

Android.mk

am d8f71d34: Merge "Out with the old; in with the new" into lmp-preview-dev

2014-06-11 17:02:18 +00:00

CleanSpec.mk

Out with the old; in with the new

2014-06-10 12:51:55 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove VideoEditor

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

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%