Ben Gruver 5e20733107 resolved conflicts for merge of 2ab72e1f to master ...

Change-Id: I752332dfb1a2f15bac22d3f1a457ae1ef20cf240

2013-04-03 17:46:19 -07:00

api

am 04e740a6: am 0f8e8b03: Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev

2013-04-03 16:33:52 -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 04e740a6: am 0f8e8b03: Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-dev

2013-04-03 16:33:52 -07:00

data

Update list of all audio files.

2013-04-03 15:36:52 -07:00

docs

am 43644aa1: am 23af4fff: am 3f000e58: am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs

2013-04-03 15:31:00 -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

Remove keystore entries when package removed

2013-04-03 11:32:52 -07:00

libs

Merge "Correct save/restore match up" into jb-mr2-dev

2013-04-03 20:31:49 +00:00

location

Annotate Locations coming from mock providers

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

media

resolved conflicts for merge of ca762bee to master

2013-04-03 14:58:48 -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 ca762bee to master

2013-04-03 14:58:48 -07:00

policy

Merge "RemoteControlClient receives playback position change requests" into jb-mr2-dev

2013-04-03 21:11:12 +00: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 2ab72e1f to master

2013-04-03 17:46:19 -07: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 3c7df09d: am 6fdcb168: Merge "Adjust the HttpResponseCache for OkHttp."

2013-04-03 14:12:27 -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%