Kenny Root 232b4d60a6 resolved conflicts for merge of c16da6aa to master ...

Change-Id: Ibaaf2995def15573609562162902b3d73dd78ec0

2013-04-02 10:57:10 -07:00

api

resolved conflicts for merge of 15935aad to master

2013-03-30 19:26:37 -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

am ef588f73: am 54531f81: Merge "Flush pending input events immediately upon channel dispose" into jb-mr2-dev

2013-04-02 08:26:04 -07:00

data

Rename DroidNaskh UI font

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

docs

am 246aed27: am 53de5c29: am f1ba1fb4: am bfe4a29b: am 1e8d22cc: am 37a10754: am 2ab25723: update IO announcement on homepage for IO Extended

2013-04-01 11:46:31 -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

KeyStore: add API to query storage type

2013-03-29 14:21:10 -07:00

libs

Prevent crash when a single layer is enqueued several times for updates

2013-03-29 12:37:16 -07:00

location

Annotate Locations coming from mock providers

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

media

am b1a2b594: am 1341f1ee: MTP: Implement date created field in GetObjectInfo

2013-04-01 11:27:43 -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

resolved conflicts for merge of 15935aad to master

2013-03-30 19:26:37 -07:00

policy

RemoteControlClient can report current position, speed

2013-03-29 09:47:48 -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

resolved conflicts for merge of c16da6aa to master

2013-04-02 10:57:10 -07:00

telephony/java

Add BT - DataTracker connection

2013-03-27 15:45:12 -07: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

am 483ac9a7: am b404ecc9: Merge "Fix build." into jb-mr2-dev

2013-03-26 18:05:43 -07: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

Original DnsSd TxtRecord file

2012-04-04 11:37:35 -07:00

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%