Andreas Gampe edaecc1db0 resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp ...

(cherry picked from commit 1272887050)

Change-Id: Ib673768fe5fc03615626ef4b10590e5317f22172

2014-11-10 21:29:52 -08:00

api

am 95ef0ac7: am 525da301: am 85d558cd: Add Activity API to get referrer information.

2014-11-11 01:03:02 +00:00

cmds

am 525da301: am 85d558cd: Add Activity API to get referrer information.

2014-11-11 00:55:10 +00:00

core

am 95ef0ac7: am 525da301: am 85d558cd: Add Activity API to get referrer information.

2014-11-11 01:03:02 +00:00

data

Use fonts for smaller languages of South and Southeast Asia.

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

docs

am 89f48e69: am 465e0532: am 2b0b7a6c: am 3bd60359: am c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs automerge: cab3443

2014-11-11 00:16:05 +00:00

drm

Frameworks/base: Wall Werror in drm

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

graphics

am e37c761e: am c30a7623: am 48c8cd06: Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev

2014-11-07 22:27:24 +00:00

include

am f89a2fda: Merge "Frameworks/base: Fix two warnings in cmds"

2014-11-08 02:04:43 +00: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 1d03b816 to lmp-mr1-dev-plus-aosp

2014-11-10 21:29:52 -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

am cba06c22: resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp

2014-11-11 04:02:22 +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 c2aa0e13: am 12174a7d: Merge "Cancel lockscreen/shade gestures when orientation changes" into lmp-mr1-dev automerge: 8334c66

2014-11-11 00:10:43 +00:00

policy

am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev

2014-11-10 22:04:09 +00:00

rs

resolved conflicts for merge of 5a2d0432 to lmp-dev-plus-aosp

2014-08-21 23:20:32 -07:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

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

services

am 95ef0ac7: am 525da301: am 85d558cd: Add Activity API to get referrer information.

2014-11-11 01:03:02 +00:00

telecomm/java

Apply @hide / @SystemApi to android.telecom.*

2014-11-10 11:52:31 -08:00

telephony/java

am bc1d9755: am 0e58219f: am 90cf41c3: Merge "SubInfoRecord provides a tinted icon with the initial embossed." into lmp-mr1-dev

2014-11-08 00:25:14 +00:00

test-runner

am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev

2014-10-30 23:44:09 +00:00

tests

am 95ef0ac7: am 525da301: am 85d558cd: Add Activity API to get referrer information.

2014-11-11 01:03:02 +00:00

tools

am 6ba4c9d9: am c78b33d0: Merge "split-select: fix OSX build" into lmp-mr1-dev automerge: be593a7

2014-11-11 03:01:46 +00:00

wifi/java/android/net/wifi

am a45e9897: am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev

2014-11-06 00:12:44 +00:00

Android.mk

am 95ef0ac7: am 525da301: am 85d558cd: Add Activity API to get referrer information.

2014-11-11 01:03:02 +00:00

CleanSpec.mk

Renaming Telecomm to Telecom.

2014-09-12 22:16:17 -07: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

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%