Jae Seo 4c9e57f156 resolved conflicts for merge of ebe661c4 to master ...

Change-Id: Ic25dc762ee43654b439de3ec237ead007bee3df4

2014-06-03 17:06:58 +00:00

api

resolved conflicts for merge of ebe661c4 to master

2014-06-03 17:06:58 +00:00

cmds

am 7ed98c43: Merge "Add an --abi argument to "pm install""

2014-06-03 13:24:45 +00:00

core

resolved conflicts for merge of ebe661c4 to master

2014-06-03 17:06:58 +00:00

data

am dfc40743: Merge "Revert ascent/descent/lineGap of Roboto to Roboto v1 values" into lmp-preview-dev

2014-06-02 18:08:19 +00:00

docs

am ec3ade5e: am 164ecfaa: am be9bf634: am a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs

2014-06-02 17:07:25 +00:00

drm

Fix a few more stray libcore.io references.

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

graphics

Merge "Add the tree hierarchy for the group"

2014-06-03 16:03:37 +00:00

include

camera2: Plumb DngCreator to native library.

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

keystore

…

libs

Merge "Cleanup"

2014-06-02 22:44:50 +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

resolved conflicts for merge of ebe661c4 to master

2014-06-03 17:06:58 +00:00

native

am c7153377: am 73da981f: Merge "Remove getRequiredPermission from NDK." into klp-modular-dev

2014-05-23 18:04:18 +00:00

nfc-extras

…

obex

…

opengl/java

opengl: Un-hide GLES31 and GLES31Ext classes

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

packages

am 00e3c58d: am 73f7cd98: Merge "Fix build."

2014-06-03 14:11:55 +00:00

policy

am 20d26282: Merge "Update global actions bug report item." into lmp-preview-dev

2014-06-02 22:10:29 +00:00

rs

Validate RenderScript context creation flags

2014-05-20 18:48:35 -07:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of ebe661c4 to master

2014-06-03 17:06:58 +00:00

telecomm/java

am 00eb98bc: Merge "Add necessary APIs to support conference calling." into lmp-preview-dev

2014-06-02 17:26:42 +00:00

telephony/java

am 6d052adc: Merge "Update showCallScreen to use Telecomm (1/6)" into lmp-preview-dev

2014-05-30 21:38:54 +00:00

test-runner

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

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

tests

Merge "Add the tree hierarchy for the group"

2014-06-03 16:03:37 +00:00

tools

Merge "Add a native Canvas wrapper."

2014-06-02 13:37:11 +00:00

wifi/java/android/net/wifi

Merge "handle removal of self added configurations"

2014-06-02 20:03:13 +00:00

Android.mk

resolved conflicts for merge of ebe661c4 to master

2014-06-03 17:06:58 +00:00

CleanSpec.mk

Put TV Input Framework under android.media.tv, including TvContract

2014-06-02 11:02:52 -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%