frameworks_base

Go to file

Sharvil Nanavati 64a4858b32 resolved conflicts for merge of 7c250056 to lmp-mr1-ub-dev

Change-Id: I8ec2e76756e61a6e6bbe85ca699facbde1c1fbc7

2015-06-23 14:07:26 -07:00

api

am f5fa550a: Merge "Move new script group API into ScriptGroup class"

2015-04-22 23:37:06 +00:00

cmds

am 2224eac3: Merge "bootanimation: fix garbage line issue when screen height is odd." into lmp-mr1-modular-dev

2015-05-07 17:06:47 +00:00

core

am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan.

2015-06-15 22:39:12 +00:00

data

Move Noto Sans Tai Le to the end of the font fallback list.

2015-03-12 15:45:32 +00:00

docs

am 813d974e: Doc change: Explicitly state the initial API level that supports maxSdkVersion attr in uses-permission.

2015-06-22 22:26:59 +00:00

drm

…

graphics

am e2fc3adb: am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc

2015-04-02 20:19:09 +00:00

include

Merge "Fix UB in ResourceTable::stringToInt."

2015-04-14 23:25:27 +00:00

keystore

Merge "frameworks/base: switch to using NativeConstants."

2015-04-24 21:26:14 +00:00

libs

DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev

2015-05-14 07:38:11 -07:00

location

am a4c40c37: am 72d33849: Merge "Missing break in switch statement"

2014-12-30 12:29:38 +00:00

media

Merge "Revert "Sometimes the application context is null""

2015-04-22 20:08:38 +00:00

native

Switch libjnigraphics to sysv-only hash style

2015-03-13 12:49:47 -07:00

nfc-extras

…

obex

…

opengl/java

…

packages

am ae363d2d: Wear doesn\'t need Shell to send notification when bugreport captured.

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

policy

am 8487c937: Merge "More inclusive rules for using outsets." into cw-d-mr1-dev

2015-06-03 22:45:59 +00:00

Move new script group API into ScriptGroup class

2015-04-22 15:34:07 -07:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of 7c250056 to lmp-mr1-ub-dev

2015-06-23 14:07:26 -07:00

telecomm/java

Define the capability to speed up MT call audio

2015-03-17 22:16:52 +00:00

telephony/java

am 74a0eb36: Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev

2015-03-18 23:44:20 +00:00

test-runner

am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev

2014-11-21 00:43:51 +00:00

tests

Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE

2015-03-31 09:15:40 -07:00

tools

am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev

2015-06-15 10:14:30 +00:00

wifi/java/android/net/wifi

Frameworks/base: Fix a hashCode implementation

2015-03-15 14:38:59 -07:00

Android.mk

am 4cbe359a: Add \'System\' group to DAC sample browser

2015-05-27 22:22:53 +00:00

CleanSpec.mk

Obliterate LockPatternUtilsCache

2014-11-12 11:31:38 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Load ICU4J data on boot

2015-04-23 14:50:34 +01:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%