Jim Miller 34f09eaf03 resolved conflicts for merge of 8f4772fe to master ...

Change-Id: I65cb4a9b3f339ad4b6997d71dc5f4577c03bb026

2013-03-12 19:19:27 -07:00

api

am c129d78e: am d665b495: Merge "Add new sensor types." into jb-mr2-dev

2013-03-12 23:07:07 +00:00

cmds

DO NOT MERGE - Full backup/restore now handles OBBs sensibly

2013-03-08 15:08:10 -08:00

core

am c631feed: am c0ce7eeb: Add a minimum size for the event pools.

2013-03-13 01:52:18 +00:00

data

Camera and MediaRecorder: Support AppOps

2013-02-25 09:27:42 -08:00

docs

am d3458de9: am adfd7c51: am 00707306: am 37fc02be: am 61f13cd8: am ae657a05: am e23f97ba: Doc change: updates to Gestures training class.

2013-03-12 22:41:57 +00:00

drm

Move stream creation outside of DrmOutputStream.

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

graphics

Merge "add getAlpha() to Drawable"

2013-03-08 23:52:33 +00:00

include

clean-up following Surface split

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

keystore

KeyStore: stop using state()

2013-02-14 12:06:51 -08:00

libs

Add TaskManager API

2013-03-12 15:06:42 -07:00

location

Annotate Locations coming from mock providers

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

media

am 1f8ac95a: am 9105ce74: Merge "audio service: fix regression in startBluetoothSco" into jb-mr2-dev

2013-03-12 22:22:27 +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

…

opengl/java

Publish new MediaCodec API

2013-03-07 14:20:46 -08:00

packages

resolved conflicts for merge of 8f4772fe to master

2013-03-12 19:19:27 -07:00

policy

Prevent momentary switch of keyguard to landscape

2013-03-12 18:45:28 -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

am 0c42b580: am 53149acf: Merge "Implement limited shared libraries in apks." into jb-mr2-dev

2013-03-12 23:10:38 +00:00

telephony/java

Turn off debug in CellInfoLte.

2013-02-12 10:47:32 -08:00

test-runner

New ContentProvider initialization for testing.

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

tests

am 0c42b580: am 53149acf: Merge "Implement limited shared libraries in apks." into jb-mr2-dev

2013-03-12 23:10:38 +00:00

tools

am 892e0782: am ad4a174b: Merge "Fix build." into jb-mr2-dev

2013-03-05 21:08:21 +00:00

wifi/java/android/net/wifi

Fix reconnect/reassociate handling

2013-03-11 08:47:39 -07:00

Android.mk

DO NOT MERGE - Full backup/restore now handles OBBs sensibly

2013-03-08 15:08:10 -08:00

CleanSpec.mk

Move a few files from frameworks/opt/telephony to frameworks/base.

2013-02-07 17:03:05 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

update preloaded-classes

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

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%