Robert Greenwalt cf7d4400f0 Merge commit 'c8cb059f' into manualmerge ...

Conflicts:
	telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

2012-07-17 16:55:22 -07:00

api

am 17990395: Merge "Fix issue #6717667: expanded notification actions don\'t work on the lock screen" into jb-dev

2012-06-25 17:37:15 -07:00

cmds

am 06c93386: Merge "Exit boot animation cleanly." into jb-dev

2012-06-20 13:37:13 -07:00

core

am 1ed1c399: Merge "Import translations. DO NOT MERGE" into jb-dev

2012-07-17 12:22:31 -07:00

data

Replace AndroidEmoji.ttf for UI optimization

2012-07-11 10:06:56 +09:00

docs

am 28a3897d: docs: re-add download.jd file to support archived SDK downloads

2012-07-17 14:14:40 -07:00

drm

…

graphics

…

icu4j

…

include

Add new ASSIST key and map it to the global assist intent.

2012-06-14 04:16:26 -07:00

keystore

…

libs

am 0a386ffa: Text shadow alpha handling incorrect DO NOT MERGE

2012-07-13 13:41:00 -07:00

location

docs: fix several links

2012-06-22 12:35:08 -07:00

media

am 38895394: Merge "Properly switch MediaRouter to wired audio over a2dp." into jb-dev

2012-07-16 17:33:40 -07:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

am c03f0a15: Merge "Import translations. DO NOT MERGE" into jb-dev

2012-07-12 12:04:49 -07:00

policy

am 8d170421: Merge "Fix wrong condition."

2012-07-16 01:55:55 -07:00

sax

…

services

am c80f72f7: Merge "Fixing issue where you couldn\'t set null RemoteViews for a widget" into jb-dev

2012-07-16 15:33:19 -07:00

telephony

Create telephony-common and mms-common

2012-07-11 16:02:08 -07:00

test-runner

docs: fix several links

2012-06-22 12:35:08 -07:00

tests

Create telephony-common and mms-common

2012-07-11 16:02:08 -07:00

tools

am 15c15eaa: Merge "Replace LruCache implementation for layoutlib. do not merge." into jb-dev

2012-07-10 18:38:21 -07:00

voip

docs: fix several links

2012-06-22 12:35:08 -07:00

wifi/java/android/net/wifi

Enhance StateMachine Quitting and logging support. DO NOT MERGE

2012-07-02 10:57:11 -07:00

Android.mk

Create telephony-common and mms-common

2012-07-11 16:02:08 -07:00

CleanSpec.mk

Remove Disco video from builds.

2012-06-13 15:34:38 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%