android_frameworks_base

Go to file

Jonathan Dixon fcb17d0375 resolved conflicts for merge of 42513ca1 to master

frameworks/base/tools was move to frameworks/tools in
I3ffafdab27cc4aca256c3a5806b630795b75d5c8)

Conflicts:
	tools/layoutlib/bridge/src/android/webkit/WebView.java

Change-Id: Idc834b0e1a4bd0d6b2c5cf6de137e45f07da4344

2013-09-11 17:18:16 -07:00

api

Update api/current.txt

2013-09-11 18:11:55 +01:00

cmds

Add #! to 'am' shell script

2013-09-04 15:39:51 -07:00

core

am ae8b57a5: am b7e5692b: Merge "Add support for loading banners from HCE services." into klp-dev

2013-09-11 16:49:14 -07:00

data

am 7b4f60de: Merge "Special case game controller fallback keys for Japan" into klp-dev

2013-09-06 19:05:44 -07:00

docs

am a0b259a9: am 161e423e: Merge "docs: Fixed deprecated value. Bug: 10641906" into jb-mr2-docs

2013-09-11 10:15:12 -07:00

drm

Revert "Enhancement for OnInfo callback on DRM Framework"

2013-09-03 10:13:17 -07:00

graphics

am 8eb3ece8: am 1d2daa78: Merge "Remove FD optimization case for decodeStream" into klp-dev

2013-09-10 09:31:04 -07:00

include

Clearly separate consumer and producer interfaces

2013-08-06 13:07:42 -07:00

keystore

Add argument to binder call to check key types

2013-09-05 13:27:00 -07:00

libs

Revert "Reconcile differences between zip implementations"

2013-09-11 22:42:02 +00:00

location

Incorporate new API council comments

2013-09-05 09:45:03 -07:00

media

resolved conflicts for merge of 03422d26 to master

2013-09-11 16:43:22 -07:00

native

Move input library code to frameworks/native.

2013-07-01 20:11:42 -07:00

nfc-extras

…

obex

Bluetooth MAP profile - sms and mms support initial check-in

2013-08-09 15:01:07 -07:00

opengl/java

…

packages

am 7bb21556: am ec7a6ea8: Merge "Add activity indicator icons to quick settings tiles." into klp-dev

2013-09-11 10:11:32 -07:00

policy

Fix issue #10688644 : Java crash in com.android.phone:

2013-09-11 09:59:47 -07:00

samples/training/network-usage

…

sax

…

services

Fix deadlock occurring on account add in SyncManager.

2013-09-11 23:40:17 +00:00

telephony/java

Fix issue #10688644 : Java crash in com.android.phone:

2013-09-11 09:59:47 -07:00

test-runner

Fix issue #10688644 : Java crash in com.android.phone:

2013-09-11 09:59:47 -07:00

tests

resolved conflicts for merge of 09ed0720 to master

2013-09-04 17:19:44 -07:00

wifi/java/android/net/wifi

resolved conflicts for merge of 03422d26 to master

2013-09-11 16:43:22 -07:00

Android.mk

Fix broken javadocs

2013-09-05 15:58:24 -07:00

CleanSpec.mk

am add9898c: am 7314eb08: Merge "Fix broken copy of kl/kcm/idc files to system image" into klp-dev

2013-09-05 15:36:38 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Merge "Preparation for deleting WebViewClassic" into klp-dev

2013-09-11 17:59:42 +00:00

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%