Alan Viverette 1461e26674 resolved conflicts for merge of 92a827b8 to master ...

Change-Id: Ia262f5c80cdaa391db08f766cee62919a8705e80

2013-10-04 10:17:09 -07:00

api

resolved conflicts for merge of 92a827b8 to master

2013-10-04 10:17:09 -07:00

cmds

am 78466f3e: am 69aa2f8a: Merge "revert ADDR_COMPAT_LAYOUT workaround."

2013-09-18 16:04:24 -07:00

core

resolved conflicts for merge of 92a827b8 to master

2013-10-04 10:17:09 -07:00

data

Add PowerManager method to assign blame to a single uid

2013-10-03 08:49:36 -07:00

docs

am 8895c2ec: am 9ca82d33: am ff757598: am 542ddc4c: am f5468f6d: update dashboard stats for 10/2/13

2013-10-02 16:47:51 -07:00

drm

…

graphics

am 6d7de848: am 1fc9eb78: am 16326f70: Merge "Fix animations, padding in RTL mode." into klp-dev

2013-10-02 09:44:16 -07:00

include

move libandroidfw to frameworks/native

2013-10-03 10:30:18 -07:00

keystore

…

libs

move libandroidfw to frameworks/native

2013-10-03 10:30:18 -07:00

location

Improve some javadoc related to isProviderEnabled() apis

2013-09-11 11:03:03 -07:00

media

am 61e5349d: am 31ea028e: am b77b7bab: Merge "Camera2: Implement idle callbacks" into klp-dev

2013-10-04 09:11:24 -07:00

native

…

nfc-extras

…

obex

Fixed review comments

2013-09-12 19:07:28 -07:00

opengl/java

…

packages

am 89862d73: am c20988e1: am 0ea4a5fb: Merge "Replace linear GradientDrawable with asset-based approach." into klp-dev

2013-10-04 09:10:29 -07:00

policy

am 12585551: am c4b27478: am 8e0ca288: Window decor rect should not include the nav bar if hidden.

2013-10-04 09:10:48 -07:00

samples/training/network-usage

…

sax

…

services

am 9701c4ef: am 3adf2172: am fe5bf7a7: Merge "Fix mount path prefix checking." into klp-dev

2013-10-04 09:10:56 -07:00

telephony/java

Add RIL_REQUEST_SET_INITIAL_ATTACH_APN.

2013-09-23 14:53:25 -07:00

test-runner

Add hidden API for querying available 'home' activities

2013-09-13 12:16:00 -07:00

tests

am 033837dd: Merge "Make fading transitions work better" into klp-dev

2013-09-30 14:13:27 -07:00

wifi/java/android/net/wifi

am 2b6b3d9c: am bad5d694: Merge "Use a build-specific wifi country code" into klp-dev

2013-10-01 18:50:20 -07:00

Android.mk

am 65cacb3c: Merge "Add android.provider.Telephony to public API." into klp-dev

2013-10-01 18:45:34 -07:00

CleanSpec.mk

am 0cc92983: am 4e6f752f: Put soundpooled sounds in the right place.

2013-09-20 11:21:56 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Merge "Preparation for deleting WebViewClassic" into klp-dev

2013-09-11 17:59:42 +00:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%