Baligh Uddin cb79506984 am 5bf93be4: (-s ours) am f0e8c78a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev ...

* commit '5bf93be4f45d62e685d2d124fa105d7fe5e9ffd1':
  Import translations. DO NOT MERGE

2013-04-30 16:45:45 -07:00

api

Remove obsolete OMA-DRM support

2013-04-29 16:48:13 -07:00

cmds

resolved conflicts for merge of b3f66877 to jb-mr2-dev-plus-aosp

2013-04-29 22:50:43 -07:00

core

am 8afd195d: am 6b313da0: Merge "Clarify behavior of fullscreen mode and softInputMode\'s adjustResize" into jb-mr2-dev

2013-04-30 16:45:42 -07:00

data

Add DPad keys to Playpad

2013-04-26 15:06:38 -07:00

docs

am 22f6a60e: Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev

2013-04-25 21:22:38 -07:00

drm

Add liblog

2013-04-09 21:54:12 -07:00

graphics

am 01e48e7d: am 22f6a60e: Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev

2013-04-25 21:27:06 -07:00

include

Allow compiling aapt for the device

2013-04-26 15:07:09 +01:00

keystore

resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

2013-04-29 23:09:03 -07:00

libs

Allow compiling aapt for the device

2013-04-26 15:07:09 +01:00

location

GPS Hardware geofencing.

2013-04-10 15:25:07 -07:00

media

Fix javadoc errors for @deprecated tags with no explanatory comment

2013-04-29 18:21:25 -07:00

native

Rewrite input handling for native applications

2013-04-22 17:01:51 -07: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

Revert all recent GLSurfaceView changes.

2013-04-19 17:19:53 -07:00

packages

Import translations. DO NOT MERGE

2013-04-29 22:48:39 -07:00

policy

Merge "Hideybar gesture clears flags if SYSTEM_UI_FLAG_FULLSCREEN"

2013-04-29 12:52:26 +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

Merge "Better --unplugged support when dumping battery."

2013-04-30 22:14:12 +00:00

telephony/java

Enhance TelephonyManger javadocs.

2013-04-25 15:02:34 -07:00

test-runner

New ContentProvider initialization for testing.

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

tests

am e9ae6822: resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

2013-04-30 09:01:38 -07:00

tools

Merge commit 'b3f66877' into afdmerge

2013-04-29 15:29:13 -07:00

wifi/java/android/net/wifi

Fix network reload when config is restored

2013-04-25 23:27:19 -07:00

Android.mk

am e9ae6822: resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

2013-04-30 09:01:38 -07:00

CleanSpec.mk

New NotificationListenerService.

2013-04-05 19:54:44 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

Original DnsSd TxtRecord file

2012-04-04 11:37:35 -07:00

preloaded-classes

resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

2013-04-29 23:09:03 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%