Scott Main 07b9b3ad3b am b45b39a2: am cdf3455c: am 6dd38cc5: Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later." ...

* commit 'b45b39a2630e58d2c546d971cc0ff8f903057329':
  Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."

2013-08-12 10:49:47 -07:00

api

Merge "API to discover granted Uri permissions." into klp-dev

2013-08-12 03:59:58 +00:00

cmds

Changes needed to support Skia at r10377.

2013-08-01 12:52:21 -04:00

core

am 9a68f82f: Add super_onDrawVerticalScrollBar to WebView.PrivateAccess. DO NOT MERGE

2013-08-12 05:47:09 -07:00

data

prototype colour emoji font

2013-08-07 15:46:16 -07:00

docs

am 6dd38cc5: Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later."

2013-08-12 10:44:44 -07:00

drm

Add liblog

2013-04-09 21:54:12 -07:00

graphics

Merge "Fix bug #10205316 CTS (KLP): android.graphics tests are failing" into klp-dev

2013-08-09 18:11:33 +00:00

include

Clearly separate consumer and producer interfaces

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

keystore

resolved conflicts for merge of fca0f92e to stage-aosp-master

2013-06-28 16:41:19 -07:00

libs

Take shadow bounds into account for quick rejects

2013-08-09 14:06:29 -07:00

location

Address Robin's code review comments in initial FlpHal submission.

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

media

Manage jclass objects (and most jobjects) in jni code using ScopedLocalRef

2013-08-12 09:23:49 -07: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 436b6ee3: Merge "Catch a few extra users of UserEnvironment." into klp-dev

2013-08-11 18:07:49 -07:00

policy

add local focus mode and input event injection API to Window

2013-08-08 19:45:21 -07:00

samples/training/network-usage

…

sax

…

services

Merge "API to discover granted Uri permissions." into klp-dev

2013-08-12 03:59:58 +00:00

telephony/java

Add network type TYPE_MOBILE_IA.

2013-07-29 15:02:29 -07:00

test-runner

Catch a few extra users of UserEnvironment.

2013-08-11 17:42:17 -07:00

tests

Support public virtual displays.

2013-08-02 21:11:07 -07:00

tools

Merge "Bring along BridgeContext for the ride." into klp-dev

2013-08-12 02:09:51 +00:00

wifi/java/android/net/wifi

am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev

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

Android.mk

Merge "Refinement of the print service APIs." into klp-dev

2013-08-11 21:42:54 +00:00

CleanSpec.mk

Add missing cleanspec

2013-08-12 09:33:38 +01: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%