frameworks_base

Go to file

Mathias Agopian fa6eda01a9 Merge commit 'goog/master' into merge_master

Conflicts:
	libs/surfaceflinger/Layer.cpp
	libs/surfaceflinger/SurfaceFlinger.cpp
	opengl/libagl/egl.cpp
	opengl/libs/EGL/egl.cpp
	opengl/libs/GLES_CM/gl.cpp
	opengl/libs/GLES_CM/gl_api.in
	opengl/libs/gl_entries.in
	opengl/libs/tools/glapigen

2009-04-30 14:43:18 -07:00

api

am 3674252: Merge change 817 into donut

2009-04-30 13:14:48 -07:00

awt

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

build

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

camera/libcameraservice

Remove debug messages.

2009-04-22 16:22:01 +08:00

cmds

auto import from //branches/cupcake_rel/...@140373

2009-03-18 17:39:46 -07:00

core

Merge commit 'goog/master' into merge_master

2009-04-30 14:43:18 -07:00

data

New font that fixes the accent shape/orientation on 1EDD

2009-04-29 12:50:23 -04:00

docs

am c13fe2c: am c804836: AI 147951: delete unused files

2009-04-29 13:35:47 -07:00

graphics/java

Merge branch 'readonly-p4-donut' into donut

2009-04-28 18:13:25 -07:00

im/java/android/im

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

include

Merge commit 'goog/master' into merge_master

2009-04-30 14:43:18 -07:00

libs

Merge commit 'goog/master' into merge_master

2009-04-30 14:43:18 -07:00

location/java

am 76b25e5: Merge change 692 into donut

2009-04-29 13:35:38 -07:00

media

am 7fe3b06: Merge change 740 into donut

2009-04-29 15:43:34 -07:00

opengl

Merge commit 'goog/master' into merge_master

2009-04-30 14:43:18 -07:00

packages

change the sync framework and users to understand Account

2009-04-23 15:37:45 -07:00

sax/java/android/sax

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

services

am 021dce4: Merge change 811 into donut

2009-04-30 12:34:10 -07:00

telephony/java

am 14533d2: AI 147720: Set default language for NL to nl.

2009-04-28 21:54:09 -07:00

test-runner

am 19aa8e0: am b867019: AI 147725: Some fixes for the CTS test runner. O

2009-04-29 13:35:41 -07:00

tests

am efae672: Merge change 725 into donut

2009-04-29 13:41:22 -07:00

tools

am 13735a2: Merge branch \'readonly-p4-donut\' into donut

2009-04-29 13:35:38 -07:00

wifi/java/android/net/wifi

AI 145980: am: CL 145881 Adding on to CL 145383, unhiding some additional methods and constants

2009-04-13 18:12:47 -07:00

Android.mk

am 487529a: First baby steps towards settings backup

2009-04-29 15:16:57 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

preloaded-classes

change the sync framework and users to understand Account

2009-04-23 15:37:45 -07:00

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%