Jim Miller e1d0909b37 am 426da339: Merge "Fix bad merge in KeyguardHostView" into jb-mr2-dev ...

* commit '426da33976036e902ea608f369d028a77afb4381':
  Fix bad merge in KeyguardHostView

2013-03-21 00:33:17 +00:00

api

Merge "Add auto-cancel ability to ObjectAnimator" into jb-mr2-dev

2013-03-21 00:02:03 +00:00

cmds

make sure screencap's data stream matches what adb expects

2013-03-20 15:40:45 -07:00

core

Merge "audio service: allow touch sounds customization" into jb-mr2-dev

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

data

Camera and MediaRecorder: Support AppOps

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

docs

am 0f6a93c4: am a75e413a: am 42d5732d: am 728c4a7e: am 90ea5cc3: Merge "Doc update: notification class bug fix" into jb-mr1.1-docs

2013-03-20 17:03:41 -07:00

drm

Move stream creation outside of DrmOutputStream.

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

graphics

Merge "Manage drawable invalidation automatically for Overlays" into jb-mr2-dev

2013-03-20 23:30:53 +00:00

include

clean-up following Surface split

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

keystore

KeyStore: add "migrate" command

2013-03-20 11:57:46 -07:00

libs

Update snapshot upon saveLayer deferral

2013-03-20 16:32:53 -07:00

location

Annotate Locations coming from mock providers

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

media

Merge "audio service: allow touch sounds customization" into jb-mr2-dev

2013-03-21 00:05:08 +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

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

…

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%