Chris Craik 2765c0b716 resolved conflicts for merge of d97303a7 to master ...

Change-Id: I29e2e64e0ec241675762482cbe5c5e9dc58adca6

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

api

am 2bf68f43: am 904aa38f: Merge "Try fixing the build again" into klp-dev

2013-09-17 17:39:35 -07:00

cmds

Implement issue #10691359: Kill long-running processes

2013-09-16 14:05:34 -07:00

core

am 30a1707a: am 9b645984: Merge "Camera2: Add docs for availableProcessedSizes" into klp-dev

2013-09-17 18:07:34 -07:00

data

…

docs

am fe790af5: am 1e6c936e: Merge "Doc change: change initial quota limit for Google Play Developer API v1_1." into jb-mr2-docs

2013-09-17 09:23:21 -07:00

drm

…

graphics

…

include

…

keystore

…

libs

resolved conflicts for merge of d97303a7 to master

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

location

…

media

am 1d47f003: am c9d1d5f3: Adjust absolute volume only when the device is streaming music

2013-09-17 16:55:21 -07:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

am 6d9b6bee: am 4811398b: Merge "Fix 10550373: Stopping FUL when emergency dialer opens" into klp-dev

2013-09-17 15:03:31 -07:00

policy

am c8d19b89: Merge "Update transient navigation confirmation wording & behavior" into klp-dev

2013-09-16 16:08:09 -07:00

samples/training/network-usage

…

sax

…

services

am 12b22479: am 222920c4: Merge "Maybe fix issue #10797796: IllegalStateException in ProcessState..." into klp-dev

2013-09-17 17:39:32 -07:00

telephony/java

…

test-runner

…

tests

…

wifi/java/android/net/wifi

am 007c6c7d: am c06b1db2: Merge "Consider current EAP TLS configurations as \'valid\'" into klp-dev

2013-09-16 16:58:46 -07:00

Android.mk

…

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%