frameworks_base

Go to file

Makoto Onuki 3b31613088 resolved conflicts for merge of 57db559d to master

Change-Id: I645993fe69116f05e2275771b51a36402ba05472

2015-07-06 13:00:51 -07:00

api

am fa75f27d: am b908616f: am 413adbe2: am 2691d08c: am c1e3ac32: Merge "Minor doc fixes for VoiceInteractor." into mnc-dev

2015-07-06 19:32:06 +00:00

cmds

am 55cd6f44: am 6fe87a56: am 68ffcf88: Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev

2015-07-04 07:28:18 +00:00

core

am fa75f27d: am b908616f: am 413adbe2: am 2691d08c: am c1e3ac32: Merge "Minor doc fixes for VoiceInteractor." into mnc-dev

2015-07-06 19:32:06 +00:00

data

am df6fd4c2: am d2c41457: Merge "Let\'s reinvent storage, yet again!" into mnc-dev

2015-06-26 16:05:25 +00:00

docs

am d931f16c: am 673f5920: am 9c4531e0: am e61668cb: am 7fe86c47: Merge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-dev

2015-07-06 15:57:01 +00:00

drm

…

graphics

Merge "Resize the VectorDrawable according to the virtual Dpi" into mnc-dev

2015-06-24 23:32:18 +00:00

include

Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files

2015-06-22 16:11:32 -07:00

keystore

Merge "KeyChain: annotate with @WorkerThread" into mnc-dev

2015-07-03 16:48:15 +00:00

libs

am e463f28e: am 1826da24: am f70a5a78: Merge "Set go-faster arguments" into mnc-dev

2015-07-04 07:28:02 +00:00

location

Fix privacy leaks in LocationManager

2015-06-22 12:42:53 -07:00

media

am d2868b8d: am e0b71b4e: Merge "media: clean up the usage of max-supported-instances." into mnc-dev

2015-07-01 17:11:30 +00:00

native

Add native tracing API

2015-06-10 13:10:36 -07:00

nfc-extras

…

obex

OBEX: Handle GET operation properly

2015-05-16 01:19:19 +00:00

opengl/java

Add tracing to GLSurfaceView

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

packages

resolved conflicts for merge of 57db559d to master

2015-07-06 13:00:51 -07:00

resolved conflicts for merge of a1867fb0 to mnc-dev-plus-aosp

2015-06-30 23:35:23 -07:00

samples/training/network-usage

…

sax

…

services

am 019e5cda: am f5205d6c: am 013ec4c2: am b41e36ba: am a72eac60: Fix a typo causing NPE in restricted profiles

2015-07-06 19:31:59 +00:00

telecomm/java

Merge "Add capability to indicate a conference will never have children." into mnc-dev

2015-07-02 18:33:53 +00:00

telephony/java

Merge "Workaround legacy TelephonyManager.getDefault() with no context" into mnc-dev

2015-07-01 23:58:46 +00:00

test-runner

Fix issue #21814207 and issue #21814212 (alarm manager)

2015-06-17 11:41:45 -07:00

tests

am 4da086ee: am 6bcdf90e: Merge "Delete unused testing scripts and WithFramework."

2015-07-04 02:57:58 +00:00

tools

am 3ce79f6c: am 96496e2d: Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev

2015-07-01 17:51:18 +00:00

wifi/java/android/net/wifi

Merge "correctly print wificonfiguration creation and update time" into mnc-dev

2015-07-01 20:06:29 +00:00

Android.mk

Grant default permissons to the default SMS, Phone, Browser app.

2015-06-29 17:44:19 -07:00

CleanSpec.mk

Remove device initializer status messages

2015-06-02 13:28:23 -04:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Frameworks/base: Update preloaded-classes

2015-06-18 20:35:10 -07:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%