Chris Craik 06e7fe5a70 resolve merge conflicts of f2235b6 to master. ...

Change-Id: Ibcef3a37ca0749931d509b53bd52e53a7d30ddbb

2014-11-20 17:27:36 -08:00

api

am a2b3a75c: am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev automerge: a79d2e8

2014-11-20 21:19:27 +00:00

cmds

am 43b8643e: am f926d71b: Merge "Fix format strings mismatching the parameters passed to them"

2014-11-20 23:57:35 +00:00

core

resolve merge conflicts of f2235b6 to master.

2014-11-20 17:27:36 -08:00

data

Use fonts for smaller languages of South and Southeast Asia.

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

docs

Merge "docs: workflow index"

2014-11-20 01:36:35 +00:00

drm

Frameworks/base: Wall Werror in drm

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

graphics

am 7010d0b6: am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev automerge: 58fa003

2014-11-14 22:00:49 +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

resolve merge conflicts of f2235b6 to master.

2014-11-20 17:27:36 -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 "Fix Crash when sending null in HashMap to getKeyRequest"

2014-11-20 23:29:08 +00:00

native

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

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

nfc-extras

…

obex

…

opengl/java

Re-allow suppressing onDetachedFromWindow

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

packages

am 582bdf9a: am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."

2014-11-20 23:19:06 +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

…

services

am fa8276c3: am 59d36695: Merge "TIF: set audio gain properly" into lmp-mr1-dev automerge: b429c01

2014-11-20 21:29:27 +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 bb35bbf1: am 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev

2014-11-19 18:05:33 +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 bac3f5a6: am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev

2014-11-14 19:17:00 +00:00

tools

Add appropriate casts for char16_t.

2014-11-20 11:47:40 -08: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 c2045047: resolved conflicts for merge of 5c7bc931 to lmp-mr1-dev-plus-aosp

2014-11-17 19:24:11 +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%