Nick Kralevich fdcb8bbb86 am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) ...

* commit 'aed7823abe0a08e4ab4cf73ce3e28f4e39a03af7':
  Bump revision number for all system images

2015-08-08 16:04:27 +00:00

apps

Set correct targetSdkVersion for DevelopmentSettings

2012-11-05 16:24:52 -08:00

build

Package renamed fonts. [DO NOT MERGE]

2014-06-12 16:16:04 -07:00

cmds/monkey

Make all monkeys do the same thing

2012-10-09 13:57:13 -07:00

docs

Revert "make target for gms and gcm javadocs and to automate entire docs build"

2013-06-17 16:10:59 +00:00

host

Windows USB Driver for generic + Q, rev 7.

2012-08-28 13:23:47 -07:00

ide

Cleanup eclipse .classpath for Gallery2

2012-11-12 14:40:23 -08:00

libraries/stereocamera

Create the directory structure for adding the stereo camera

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

ndk

am 0f0de77b: am b034233a: am 3c901267: Merge "Update README.CRT.TXT"

2012-09-24 10:16:42 -07:00

samples

am 8654b6c6: am 3ff1591c: am 28b127ec: New DevBytes animation demos

2013-05-30 15:04:40 -07:00

scripts

Update appengine server to handle '@'.

2013-07-17 10:08:27 -07:00

sdk

am ca8720d5: DO NOT MERGE Increase the system-image revision number after opengl bug fix

2015-08-07 18:39:28 +00:00

sdk_overlay

Add platform FLP for emulator config

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

testrunner

Generalize support library tests.

2013-05-30 14:28:43 -07:00

tools

DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer

2015-07-21 16:55:40 +00:00

tutorials/NotepadCodeLab

update notepad tutorial to change activity title in NoteEdit class

2010-06-17 10:04:10 -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%