Narayan Kamath 0051514845 resolved conflicts for merge of 396b9e79 to master ...

Change-Id: Ie71a79699be57f5af6069559068bf6253835d805

2014-02-13 11:48:48 +00:00

api

Merge "Update smoothScrollToPosition to move faster for large offsets"

2014-02-12 23:51:56 +00:00

cmds

Merge "sqlite integer fields are long"

2014-01-08 22:22:27 +00:00

core

resolved conflicts for merge of 396b9e79 to master

2014-02-13 11:48:48 +00:00

data

Merge "Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode."""

2014-01-10 17:44:22 +00:00

docs

am b9378d81: am 321cd18a: am 820bb4bd: am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages.

2014-02-13 11:27:30 +00:00

drm

Update DrmOutputStream to use raw FileDescriptor.

2014-02-06 09:47:38 -08:00

graphics

Fix gradient radius attribute to match documentation

2014-02-12 13:50:34 -08:00

include

resolved conflicts for merge of 1cbea39f to master

2014-02-12 14:41:25 -08:00

keystore

KeyChain: add explicit package for getPrivateKey

2014-02-07 09:14:32 -08:00

libs

resolved conflicts for merge of 1cbea39f to master

2014-02-12 14:41:25 -08:00

location

Remove unused imports from frameworks/base.

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

media

am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"

2014-02-11 16:40:35 +00:00

native

AArch64: Make AssetManager and related classes 64-bit compatible

2014-01-31 14:14:29 +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

Use long to store pointers in GLES_JNI/EGL classes

2014-01-31 16:27:30 +00:00

packages

Merge "Import translations. DO NOT MERGE"

2014-02-13 05:14:33 +00:00

policy

Simplify immersive mode confirmation cling logic.

2014-02-12 10:33:21 -05:00

rs

am 38d799fc: Merge "Generic object based data copy."

2014-02-10 15:29:55 -08:00

samples/training/network-usage

cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2

2012-08-08 11:27:09 -07:00

sax

Remove unused imports from frameworks/base.

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

services

resolved conflicts for merge of 396b9e79 to master

2014-02-13 11:48:48 +00:00

telephony/java

resolved conflicts for merge of 396b9e79 to master

2014-02-13 11:48:48 +00:00

test-runner

am e014eb63: am fc6b772f: am bf6d0797: am 2f1c2e32: am 3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs

2014-01-16 00:47:37 +00:00

tests

Refactor HardwareLayer

2014-02-10 20:55:39 -08:00

tools

am f7193bf8: am d9f9da39: am 56b86deb: am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.

2014-02-10 20:04:05 +00:00

wifi/java/android/net/wifi

Move Wifi/P2p service components under services

2013-12-11 16:06:49 -08:00

Android.mk

am b9378d81: am 321cd18a: am 820bb4bd: am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages.

2014-02-13 11:27:30 +00:00

CleanSpec.mk

am 9158825f: Move some system services to separate directories

2013-12-19 23:30:35 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

am aa6ff54e: am 85ee57d1: am c064a1b5: Merge "Remove DRLCertFactory"

2014-01-31 23:07:24 +00:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%