Alan Viverette 516f953a82 resolved conflicts for merge of e4ccb864 to master ...

Change-Id: I50c41c712c4eb4f68b22777efb2e5d5370536b22

2013-10-07 18:05:09 -07:00

api

am 9d1383c6: am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev

2013-10-07 15:16:14 -07:00

cmds

am 65d57713: am bacb5422: Merge "Also rely on enabled notification listeners for RemoteController registration" into klp-dev

2013-10-07 10:10:08 -07:00

core

resolved conflicts for merge of e4ccb864 to master

2013-10-07 18:05:09 -07:00

data

Add PowerManager method to assign blame to a single uid

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

docs

…

drm

…

graphics

am 266b3026: am 20ba658b: am 31049d76: Use SCREEN Xfermode for keyguard badges; update SeekBar

2013-10-07 17:01: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

…

media

am 47f698b8: am c38c93f4: am 1a1e24f1: Merge "Update RemoteController info when enabling/disabling it" into klp-dev

2013-10-07 17:53:34 -07:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

am e5812347: am 9aa58405: am 5dadf838: Merge "Fix crash in built-in wallpaper cropper" into klp-dev

2013-10-07 17:30:23 -07:00

policy

resolved conflicts for merge of e4ccb864 to master

2013-10-07 18:05:09 -07:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of e4ccb864 to master

2013-10-07 18:05:09 -07:00

telephony/java

New Telephony APIs to return MMS UA and UAProfUrl

2013-10-03 15:06:21 -07:00

test-runner

Add <intent-filter> support to <provider>.

2013-10-07 14:19:13 -07:00

tests

…

wifi/java/android/net/wifi

am 72566b98: am 1c6fdd6c: am cac2fd30: Merge "Revert "Use a build-specific wifi country code"" into klp-dev

2013-10-04 13:36:49 -07:00

Android.mk

am 856441e7: am 920de6c6: am 332408f8: update version number for doc stamp

2013-10-04 17:37:02 -07:00

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%