Jorim Jaggi 0772bfd206 "resolved conflicts for merge of caacc8ba to master" ...

Change-Id: I7904ac66ded45c3173af14d2940dc8210088e387

2015-08-18 20:04:01 -07:00

api

am de243eb2: am 55d39ecb: am d74a66bd: Merge "Introduce permission for updating the cell broadcast content provider." into cw-e-dev

2015-08-17 20:16:27 +00:00

cmds

am fc010d00: am 1d9a8c58: am 2591d6ff: am 358fcc79: Do not start with a black frame in bootanimation

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

core

am 849b9e58: am ce6fb7bb: am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev

2015-08-19 02:21:58 +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 b8eb9aa3: am 23cee7ca: am a2de2177: am df23f371: am c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev

2015-08-19 02:22:26 +00:00

drm

…

graphics

Revert "Add ninePatch support to Canvas.h"

2015-08-17 15:24:09 -07:00

include

am 60a2716f: am 3244dc22: am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev

2015-08-18 09:59:11 +00:00

keystore

Add more examples of generating/importing keys to Javadocs.

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

libs

am 7da9d7fa: am 9c45aa8f: am ca3c865d: am 892768fb: am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev

2015-08-19 02:22:33 +00:00

location

Add callback-based support for Hardware Activity Recognition.

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

media

Merge "Add API for uploading files to MTP devices."

2015-08-17 14:33:00 +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 caacc8ba to master"

2015-08-18 20:04:01 -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

am 3170650a: am 56df15d3: am 5b3a38e0: am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev

2015-08-19 02:22:12 +00:00

telecomm/java

am f6401419: am 340314fd: am 7c3d595a: am 4b655fd1: am b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev

2015-08-14 15:44:14 +00:00

telephony/java

am 737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev

2015-08-12 23:17:27 +00: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

am 84d4917c: am 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."

2015-08-17 21:27:41 +00: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

am b854bced: am 9b8bc3dc: am db5b38b2: am 195b1fd2: am 8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev

2015-08-13 21:07:06 +00: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%