Jim Miller c81a5d6321 Fix bad merge in KeyguardHostView ...

This restores the fix detailed in Change-Id: I866d4b42493df3a6449d8eabc3ea140dc39dac57

Change-Id: Ibe75afd7a612cf96a56e5815a198c2047c7ff5bd

2013-03-20 17:26:53 -07:00

api

Merge "Add the orientation hint to the MediaMuxer" into jb-mr2-dev

2013-03-20 20:53:01 +00:00

cmds

make sure to start the binder thread pool

2013-03-19 20:56:00 -07:00

core

Merge "Fix bug #8437358 Clean any ICU related code from TextLayout / Paint and their dependencies" into jb-mr2-dev

2013-03-20 22:27:37 +00:00

data

Camera and MediaRecorder: Support AppOps

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

docs

am 2c824c21: am ad070e0c: am 1d7ac400: am bb3f2b9c: am 15de1aa9: Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs

2013-03-20 15:33:56 -07:00

drm

Move stream creation outside of DrmOutputStream.

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

graphics

Fix bug #8437358 Clean any ICU related code from TextLayout / Paint and their dependencies

2013-03-20 14:56:05 -07: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

Merge "Use snapshot alpha for layers" into jb-mr2-dev

2013-03-20 22:22:44 +00:00

location

Annotate Locations coming from mock providers

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

media

Merge "Add the orientation hint to the MediaMuxer" into jb-mr2-dev

2013-03-20 20:53:01 +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

Merge "Prevent Recents from doing a relayout" into jb-mr2-dev

2013-03-20 21:38:31 +00:00

policy

Fix bad merge in KeyguardHostView

2013-03-20 17:26:53 -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 "Add API to control scan always mode" into jb-mr2-dev

2013-03-20 15:49:20 +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

Merge "Fix bug #8437358 Clean any ICU related code from TextLayout / Paint and their dependencies" into jb-mr2-dev

2013-03-20 22:27:37 +00:00

tools

Fix build.

2013-03-05 10:28:05 -08:00

wifi/java/android/net/wifi

Merge "Add API to control scan always mode" into jb-mr2-dev

2013-03-20 15:49:20 +00: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%