Michael Wright 6484c0e013 Merge addition of supports-input tag into master ...

aapt has been moved out of f/b which caused merged conflicts in
the original commit

Conflicts:
	tools/aapt/Command.cpp

Change-Id: I181ac6a3382eb4858110b30c64fc734a8af4929b

2013-09-06 09:39:34 -07:00

api

Merge "Fix broken javadocs"

2013-09-06 16:06:17 +00:00

cmds

Add #! to 'am' shell script

2013-09-04 15:39:51 -07:00

core

Merge addition of supports-input tag into master

2013-09-06 09:39:34 -07:00

data

Fix broken copy of kl/kcm/idc files to system image

2013-09-05 15:27:32 -07:00

docs

am 966b9d46: am 002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs

2013-09-04 15:40:27 -07:00

drm

Revert "Enhancement for OnInfo callback on DRM Framework"

2013-09-03 10:13:17 -07:00

graphics

am 04f31501: am a9fa33b3: Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev

2013-09-05 10:13:34 -07:00

include

Clearly separate consumer and producer interfaces

2013-08-06 13:07:42 -07:00

keystore

Add argument to binder call to check key types

2013-09-05 13:27:00 -07:00

libs

am 7ff37ada: am ff2c22e2: Merge "Move functor GL setup to just before functor" into klp-dev

2013-08-26 15:12:06 -07:00

location

Incorporate new API council comments

2013-09-05 09:45:03 -07:00

media

Merge "Java API for AudioTrack timestamps" into klp-dev

2013-09-04 22:29:19 +00:00

native

Move input library code to frameworks/native.

2013-07-01 20:11:42 -07:00

nfc-extras

Clean up dist files.

2013-05-21 12:38:22 -07:00

obex

Bluetooth MAP profile - sms and mms support initial check-in

2013-08-09 15:01:07 -07:00

opengl/java

Merge "Fix wrapper equals()"

2013-06-24 17:42:25 +00:00

packages

am 833384ba: am 23e2bba4: Merge "Spooler broken on upgrade." into klp-dev

2013-09-05 23:52:21 -07:00

policy

Merge "Remove opaque-on-interaction from nav bar." into klp-dev

2013-09-05 23:20:00 +00:00

samples/training/network-usage

…

sax

…

services

Merge "Fix broken javadocs"

2013-09-06 16:06:17 +00:00

telephony/java

am 323af8b4: am aa5b0f8b: am ce1e3798: Add provisioning apn timeout.

2013-09-04 18:17:15 -07:00

test-runner

Add CancellationSignal support to file operations.

2013-08-23 11:27:25 -07:00

tests

resolved conflicts for merge of 09ed0720 to master

2013-09-04 17:19:44 -07:00

wifi/java/android/net/wifi

Remove synchronization in WifiMonitorSingleton.

2013-09-06 09:21:10 +00:00

Android.mk

Fix broken javadocs

2013-09-05 15:58:24 -07:00

CleanSpec.mk

am add9898c: am 7314eb08: Merge "Fix broken copy of kl/kcm/idc files to system image" into klp-dev

2013-09-05 15:36:38 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

am c40e46e8: am bfe1b801: Merge "Update preloaded-classes"

2013-07-30 14:10:43 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%