John Spurlock 8740cb1da6 resolved conflicts for merge of 29211d3a to master ...

Change-Id: I9691f41b12fbf52d0ef35a9bf5223edef7afdfd2

2013-04-05 16:18:59 -04:00

api

resolved conflicts for merge of 29211d3a to master

2013-04-05 16:18:59 -04: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 29211d3a to master

2013-04-05 16:18:59 -04:00

data

Update list of all audio files.

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

docs

am 614c155f: am f64ad28f: am 15ebf622: am f614d536: am e4922f28: Merge "Doc update: clean up text and code snippets" into jb-mr1.1-docs

2013-04-03 18:45:29 -07:00

drm

Move stream creation outside of DrmOutputStream.

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

graphics

Phase 1 of refactoring SystemServer.

2013-04-04 09:49:22 -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

am 21af446c: am a151ef8c: Merge "First OpenGL ES 3.0 based optimization" into jb-mr2-dev

2013-04-04 16:01:59 -07:00

location

Annotate Locations coming from mock providers

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

media

Merge "Update AudioTrack docs for source sample rate"

2013-04-05 17:41:12 +00: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 29211d3a to master

2013-04-05 16:18:59 -04:00

policy

am 2987c218: am 728827ff: Merge "Uphold common ordering expectations around action bar Home/Up dispatch" into jb-mr2-dev

2013-04-04 11:10:24 -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 29211d3a to master

2013-04-05 16:18:59 -04: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

resolved conflicts for merge of 29211d3a to master

2013-04-05 16:18:59 -04:00

tools

am ecc5b436: am 745a42bb: Merge "aapt: add support for optional uses-permission" into jb-mr2-dev

2013-04-04 17:34:29 -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

resolved conflicts for merge of 29211d3a to master

2013-04-05 16:18:59 -04:00

CleanSpec.mk

New NotificationListenerService.

2013-04-05 19:54:44 +00: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%