Geoff Mendal 31d8ebdf19 Fix merge conflicts in 1b645ee0325615a9797fc8e0dba728c85507da0c

2014-06-03 18:13:26 -07:00

api

am 594ac157: Merge "TvContract: Address the feedback from the API review" into lmp-preview-dev

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

cmds

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

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

core

am 81dfc082: Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev

2014-06-03 22:44:52 +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 c5d7478c: am e21d8d7b: am 93a27e23: am 7f0c6478: Merge "Adjust h3 margins for dynamic content blocks." into klp-docs

2014-06-04 00:12:05 +00:00

drm

Fix a few more stray libcore.io references.

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

graphics

Merge "Handle the alpha in the group setting and fix the fill issue."

2014-06-03 18:07:31 +00:00

include

camera2: Plumb DngCreator to native library.

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

keystore

Use the correct package name for CHOOSER

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

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

Merge "Update android.media.AudioTrack.getTimestamp API documentation"

2014-06-03 20:38:08 +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

Clean up dist files.

2013-05-21 12:38:22 -07:00

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

am a0437d35: Merge "Hide header when notifications collide with it on Keyguard." into lmp-preview-dev

2014-06-03 17:15:26 +00:00

policy

am 81dfc082: Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev

2014-06-03 22:44:52 +00:00

rs

Add support for mixed 32/64 APKs using RenderScript.

2014-06-03 15:11:37 -07:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

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

services

am 81dfc082: Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev

2014-06-03 22:44:52 +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

Add AnimationDrawable test

2014-06-03 14:26:29 -07:00

tools

am 81dfc082: Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev

2014-06-03 22:44:52 +00:00

wifi/java/android/net/wifi

Add class CellularNetwork for plmn parsing and retrieve mcc and mnc.

2014-06-03 10:10:12 -07: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

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%