Scott Kennedy 7ee8002aab resolved conflicts for merge of b5d6b3fe to master ...

Change-Id: Ib7beb5c22fadd7aae5039d49a819fbc91d355b6b

2013-04-03 11:15:50 -07:00

api

am a51a6381: am 279e22bd: Merge "make new API to retrieve group identifier level1" into jb-mr2-dev

2013-04-02 12:25:38 -07:00

cmds

am 960650c6: am 7ba6470f: am 4224a4ca: am 3864aa39: Merge "Add interrupter library to simulate EINTR"

2013-03-27 17:51:11 -07:00

core

resolved conflicts for merge of b5d6b3fe to master

2013-04-03 11:15:50 -07:00

data

Rename DroidNaskh UI font

2013-03-29 16:13:36 -07:00

docs

am 23eda7cd: am 76f9a0a6: am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev

2013-04-03 09:38:49 -07:00

drm

Move stream creation outside of DrmOutputStream.

2012-12-17 17:04:16 -08:00

graphics

am 28c2246f: am 4134ce33: Merge "Fix blur intrinsic creation." into jb-mr2-dev

2013-04-01 13:32:29 -07:00

include

clean-up following Surface split

2013-02-15 12:47:40 -08:00

keystore

Add API to query KeyChain algorithm support, pt. 2

2013-04-02 11:23:41 -07:00

libs

Update view's alpha and layer docs

2013-04-01 17:21:35 -07:00

location

Annotate Locations coming from mock providers

2013-01-22 09:39:47 -08:00

media

am 30b95a60: am 5c0ce512: Merge "MediaDrm API update" into jb-mr2-dev

2013-04-02 16:50:40 -07:00

native

Fix typo

2012-12-12 11:27:44 +08:00

nfc-extras

Add exception types for NfcEe operations.

2013-02-12 13:43:30 -08:00

obex

Add NOTICE and MODULE_LICENSE_BSD_LIKE for obex

2012-04-06 14:04:31 -07:00

opengl/java

Fix createSurface / eglCreateWindowSurface race.

2013-03-18 22:55:27 -07:00

packages

am e884f6b8: am dbd9c337: Merge "Change time format for default clock in keyguard" into jb-mr2-dev

2013-04-02 19:25:17 -07:00

policy

am 9d4ed1ec: am ddd168d6: Merge "Add global key configuration file" into jb-mr2-dev

2013-04-02 19:25:27 -07:00

samples/training/network-usage

cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2

2012-08-08 11:27:09 -07:00

sax

…

services

Merge "Move startActivityUncheckedLocked to Supervisor"

2013-04-03 17:59:21 +00:00

telephony/java

Merge "make new API to retrieve group identifier level1" into jb-mr2-dev

2013-04-02 19:17:23 +00:00

test-runner

New ContentProvider initialization for testing.

2013-02-26 16:16:14 -08:00

tests

am 4a7fae49: am eb93cc6a: Merge "add account checks to app launch test" into jb-mr2-dev

2013-03-22 19:35:33 +00:00

tools

resolved conflicts for merge of 5856ee4b to master

2013-04-02 17:16:55 -04:00

wifi/java/android/net/wifi

Merge "Scope certs for wifi UID and handle migration" into jb-mr2-dev

2013-03-29 17:32:44 +00:00

Android.mk

am 901b77c6: am ca3d655d: Merge "Use input transport for communications between app and IME." into jb-mr2-dev

2013-03-26 19:48:23 -07:00

CleanSpec.mk

Use input transport for communications between app and IME.

2013-03-26 15:42:39 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

update preloaded-classes

2013-03-11 09:59:13 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%