Jorim Jaggi 95d16bffbf resolved conflicts for merge of 7dea1b3b to master ...

Change-Id: I51acda15b42952cda1838d7124fc991d367f0693

2015-08-24 17:42:02 -07:00

api

Using initial activity layout to position the launching activity.

2015-08-24 07:35:38 -07:00

cmds

pm: translate incoming user id for installation

2015-08-24 11:00:14 -07:00

core

am f76d558b: am 93826c7e: am f2c5ce5d: am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev

2015-08-24 23:39:22 +00:00

data

am 0f3ac894: am c91b67ad: am 31a536e1: am 57928364: am 53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev

2015-08-19 02:21:30 +00:00

docs

am 49aadbce: am f2a7fed4: am c9a110b0: am 8c8a0c00: am c550a6fa: Merge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev

2015-08-24 23:39:39 +00:00

drm

…

graphics

Reverse order of RT animations so enter animation works correctly

2015-08-24 17:25:36 -04:00

include

resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev

2015-08-21 09:53:41 +02:00

keystore

Add more examples of generating/importing keys to Javadocs.

2015-08-11 11:36:09 -07:00

libs

Merge "Add static asserts around assumed-static skia enum values"

2015-08-21 23:09:24 +00:00

location

Add callback-based support for Hardware Activity Recognition.

2015-07-27 13:40:21 -07:00

media

Merge "AudioTrack: error reporting for getTimestamp()"

2015-08-24 17:06:32 +00:00

native

Call getInstanceForPackage instead of creating a new SensorManager instance.

2015-07-30 19:04:40 +00:00

nfc-extras

…

obex

…

opengl/java

Add tracing to GLSurfaceView

2015-06-08 17:40:00 -07:00

packages

resolved conflicts for merge of 7dea1b3b to master

2015-08-24 17:42:02 -07:00

rs

am ed3ffe0f: am 6430812a: Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel."

2015-07-23 22:54:06 +00:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of 7dea1b3b to master

2015-08-24 17:42:02 -07:00

telecomm/java

am 393a93ab: am 7d4cf23f: am 9e191aa6: am a6562603: am 1e9bfc64: Fix incorrect android.telecom.Call.Details equality check.

2015-08-19 23:13:40 +00:00

telephony/java

resolved conflicts for merge of bbd854e2 to master

2015-08-20 12:44:04 -07:00

test-runner

am 56de6167: am f6c2d8a9: am 6da43a83: am 9352af2a: Merge "Remove dependencies on the package installer\'s package name" into mnc-dev

2015-07-29 19:23:52 +00:00

tests

am 564e87a3: am 1058bf0f: am e2fd2850: am 9e398eb5: am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev

2015-08-14 17:44:30 +00:00

tools

Fix build.

2015-08-19 15:12:11 -07:00

wifi/java/android/net/wifi

Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev

2015-08-05 01:10:34 +00:00

Android.mk

resolved conflicts for merge of bcc26c02 to master

2015-08-21 18:08:58 -07:00

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove EmojiFactory and its mentions from frameworks.

2015-08-07 12:57:01 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%