Jesse Hall 94bb931884 resolved conflicts for merge of 3e06bd39 to master ...

I'm not sure why git thought there was a conflict; it thought these
files had been deleted in master and renamed in lmp-preview-dev. In
reality, they've never existed anywhere, and were created in
lmp-preview-dev by the change being merged. Weird.

Conflicts:
	ndk/platforms/android-21/arch-arm/symbols/libGLESv3.so.functions.txt
	ndk/platforms/android-21/arch-arm/symbols/libGLESv3.so.variables.txt
	ndk/platforms/android-21/arch-arm64/symbols/libGLESv3.so.functions.txt
	ndk/platforms/android-21/arch-arm64/symbols/libGLESv3.so.variables.txt
	ndk/platforms/android-21/arch-mips/symbols/libGLESv3.so.functions.txt
	ndk/platforms/android-21/arch-mips/symbols/libGLESv3.so.variables.txt
	ndk/platforms/android-21/arch-mips64/symbols/libGLESv3.so.variables.txt
	ndk/platforms/android-21/arch-x86/symbols/libGLESv3.so.variables.txt
	ndk/platforms/android-21/arch-x86_64/symbols/libGLESv3.so.variables.txt

Change-Id: Ic7cc66f1fa053ff05d55911caad92dfd6669138d

2014-06-10 12:17:15 -07:00

apps

am 361fce55: am d9fb901d: am 479cf9ff: Merge "Track changes to IActivityManager.startInstrumentation."

2014-05-30 11:50:55 +00:00

build

am 0b7a8dbd: Merge "Revert "Package renamed fonts."" into lmp-preview-dev

2014-06-09 15:55:46 +00:00

cmds/monkey

am 361fce55: am d9fb901d: am 479cf9ff: Merge "Track changes to IActivityManager.startInstrumentation."

2014-05-30 11:50:55 +00:00

docs

am 9fc688f4: am 6e58370c: am 4d3ff06e: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"

2013-06-17 10:03:54 -07:00

host

Android USB driver: support 4EE7 (Nexus adb only).

2014-06-06 12:50:21 -07:00

ide

resolved conflicts for merge of a706c744 to master-nova

2014-05-12 17:19:20 -07:00

libraries/stereocamera

Create the directory structure for adding the stereo camera

2011-05-19 15:10:19 -07:00

ndk

resolved conflicts for merge of 3e06bd39 to master

2014-06-10 12:17:15 -07:00

perftests/panorama

Build both 64- and 32-bit versions.

2014-05-30 09:58:47 -07:00

samples

am 893d702d: Follow directory API changes.

2014-06-10 14:55:36 +00:00

scripts

am 39d51c9a: am eb96f654: am bc6a6036: Merge "Fix the stack/ tool for 64 bit archs."

2014-04-22 13:49:45 +00:00

sdk

am 95671f78: am 03afa4d6: Merge "Android USB driver: support 4EE7 (Nexus adb only)."

2014-06-06 22:23:19 +00:00

sdk_overlay

Add platform FLP for emulator config

2012-10-23 18:36:46 -07:00

sys-img

am 4000df93: am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder."

2014-06-04 21:58:54 +00:00

testrunner

am 70939ca3: Adding telecomm-unit alias for running telecomm tests with runtest.

2014-05-13 15:17:43 +00:00

tools

DO NOT MERGE: fix package for AndroidJUnitRunner

2014-06-04 09:59:22 -07:00

tutorials

Add "Force a Double Free" button to stress test the tools.

2013-09-16 12:12:51 -07:00

.gitignore

Add generated testrunner files to .gitignore

2010-11-20 11:48:57 -08:00

CleanSpec.mk

Remove references to global proxy APIs

2011-02-16 10:51:01 -08:00

Description

android_development

592 MiB

Languages

PostScript 31.4%

TypeScript 16.9%

C++ 15.5%

Python 11.8%

Java 11.4%

Other 12.7%