Raphael Moll 6b65c84656 resolved conflicts for merge of 7f45b2e9 to master ...

Explanation of conflict:
- I did modify master a while go to support new
  source_prop_template files.
- That CL was then manually merged into master-aosp
  and then auto-merged back to master.
- The template files were already in master.
- But the master version had 1 extra new line in each
  (to add gpu support).
- Thus conflict. CQFD.

Change-Id: I0a04a0239fabbdc5349e197af4531a5ea6b2ff76

2012-03-28 11:53:42 -07:00

apps

Remove old development settings.

2012-02-14 13:51:05 -08:00

build

SDK: correctly zip sources.zip package.

2012-03-27 10:49:58 -07:00

cmds/monkey

Package control per user

2012-03-20 11:48:16 -07:00

data/etc

Update version of apn configuration files to version 7

2011-09-29 15:23:05 -07:00

docs

Happy new year!

2011-01-12 10:35:32 -08:00

host

SDK: updating android Windows USB Driver.

2011-10-27 15:43:22 -07:00

ide

update Eclipse include paths

2012-03-08 21:05:49 -08:00

libraries/stereocamera

Create the directory structure for adding the stereo camera

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

ndk

am 314dea12: am 58f599f9: am 2038b5ac: am 799fada5: Merge "ndk: Include limits.h in wchar.h as it contains the definitions for INT_MAX and INT_MIN. Without this fix, the following lines will fail when configuring gnu stdlibc++ library. (INT_MAX and INT_MIN are undefin

2012-03-27 10:19:43 -07:00

pdk

Merge "Modify Bluetooth Porting page image."

2011-03-24 17:17:14 -07:00

samples

Add API demo for thumbnail animations.

2012-03-23 16:37:04 -07:00

scripts

Adding Android Developers Google+ redirect

2012-02-03 12:32:10 -08:00

sdk

am 79977b40: am 8d2f79ba: Merge "SDK: generate repo using latest schemas when available."

2012-03-22 13:30:16 -07:00

sdk_overlay

Make the SDK system image be voice enabled.

2011-09-28 15:42:37 -07:00

testrunner

Merge commit 'fb11862390f6468a24a3a7aef57ffcfc0f5a3290'

2012-03-21 15:30:25 -07:00

tools

Update emulated camera to support HAL v2.0 modules and devices.

2012-03-27 16:40:12 -07: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%