Daniel Sandler 245f8a9501 resolved conflicts for merge of 5fa473cd to master ...

Change-Id: I097ac206c5232b0596d9d81baad3a501492335ca

2013-10-14 14:25:26 -04:00

api

am 67af9ce3: am c73810de: am 45ca531e: Merge "Adding stepcounter & stepdetector feature strings." into klp-dev

2013-10-14 10:52:15 -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 5fa473cd to master

2013-10-14 14:25:26 -04:00

data

Add PowerManager method to assign blame to a single uid

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

docs

am e8117b64: am a2c64bb6: am 91245730: am ca338777: am 45edbb70: DOC CHANGE: FileProvider training class

2013-10-12 15:56:42 -07:00

drm

…

graphics

DO NOT MERGE: Hide new camera API.

2013-10-11 19:26:08 +00: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

Merge "DO NOT MERGE: Hide new camera API." into klp-dev

2013-10-13 01:50:30 +00:00

native

…

nfc-extras

…

obex

Fixed review comments

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

opengl/java

…

packages

am c07f048d: am 4a913455: am 00f597bc: Adding additional MNC overlays. (Bug 10518893)

2013-10-14 10:53:25 -07:00

policy

resolved conflicts for merge of 5fa473cd to master

2013-10-14 14:25:26 -04:00

samples/training/network-usage

…

sax

…

services

am 10caa3b8: am d3b2fa49: am e1db0dd0: Test for task in front must include stack in front.

2013-10-14 10:53:11 -07:00

telephony/java

Telephony: SMS over IMS

2013-10-10 23:23:48 +00:00

test-runner

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

2013-10-07 14:19:13 -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 dcc31551: am e9d99705: am 72dc0b43: Merge "Make Wifi Scans more heap-efficient" into klp-dev

2013-10-14 10:49:34 -07:00

Android.mk

am 5c880d0d: am 6f688e87: am 8f34715b: Merge "Refactor how the print dialog activity is started." into klp-dev

2013-10-11 10:11:05 -07:00

CleanSpec.mk

am 5c880d0d: am 6f688e87: am 8f34715b: Merge "Refactor how the print dialog activity is started." into klp-dev

2013-10-11 10:11:05 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Update preloaded-classes for KLP

2013-10-09 20:45:30 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%