Andreas Gampe 8a902d9f24 resolved conflicts for merge of 220c3f4f to master ...

Change-Id: I37ecce8fddecdff82b0eace16f1ee75152f7171e

2014-11-21 15:51:04 -08:00

api

am 296ea917: am deee5566: am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev

2014-11-21 22:33:01 +00:00

cmds

am 28096c49: Merge "Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION" into lmp-mr1-dev

2014-11-21 03:01:09 +00:00

core

am 79ef5ef7: am 54c11274: am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev

2014-11-21 23:14:12 +00:00

data

Use fonts for smaller languages of South and Southeast Asia.

2014-11-10 12:49:20 -08:00

docs

am bc250401: am d4ea7b3c: am 9aede602: am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev automerge: 161dce4

2014-11-21 12:19:50 +00:00

drm

Frameworks/base: Wall Werror in drm

2014-11-10 17:23:02 -08:00

graphics

Merge "Revert "Add a way to override Xfermode""

2014-11-21 22:11:14 +00:00

include

Merge commit '06d8b7b8' into manualmerge

2014-11-17 12:17:16 -08:00

keystore

Correct test data size in keystore signing and verification tests.

2014-09-14 17:09:47 +00:00

libs

resolved conflicts for merge of 220c3f4f to master

2014-11-21 15:51:04 -08:00

location

am 00916297: am 3546c9a5: Merge "Mark Gps Raw related APIs as System APIs. b/16727892" into lmp-mr1-dev

2014-11-07 18:43:36 +00:00

media

Merge "resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp

2014-11-21 18:27:52 +00:00

native

Merge "Frameworks/base: Wall Werror in native/graphics"

2014-11-11 01:56:11 +00:00

nfc-extras

Clean up dist files.

2013-05-21 12:38:22 -07:00

obex

Bluetooth: Support MAP Client role on Bluedroid.

2014-07-01 18:01:27 +00:00

opengl/java

Re-allow suppressing onDetachedFromWindow

2014-10-01 10:38:07 -07:00

packages

am 879a4ee8: Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5e automerge: eab3240

2014-11-21 22:32:40 +00:00

policy

am e672db28: am ed097689: Merge "Add animations for the system bar color views" into lmp-mr1-dev

2014-11-18 20:32:28 +00:00

rs

Fix format strings mismatching the parameters passed to them

2014-11-20 15:24:46 -08:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

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

services

am 79ef5ef7: am 54c11274: am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev

2014-11-21 23:14:12 +00:00

telecomm/java

Merge "Change Connections to allow setting conferenceable with conferences." into lmp-mr1-dev

2014-11-20 03:40:10 +00:00

telephony/java

am 49414b5b: am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev automerge: 1caab41

2014-11-21 02:57:27 +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

am 3458abd6: am 002bc810: Merge "ASLD: ASLD\'s XML reversible flag can turn off the reverse behavior now." into lmp-mr1-dev automerge: e9dbfe5

2014-11-21 03:11:39 +00:00

tools

am fbff0191: am 58238d90: am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-dev automerge: ddc83df

2014-11-21 12:19:14 +00:00

wifi/java/android/net/wifi

am 77fe4c96: am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev

2014-11-19 22:21:38 +00:00

Android.mk

am b5ba786c: am 18ab5c21: Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-dev automerge: 52dcc7f

2014-11-21 03:11:35 +00:00

CleanSpec.mk

Obliterate LockPatternUtilsCache

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

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Revert "Revert "Frameworks/base: Update to preloaded-classes""

2014-10-02 19:05:44 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%