Takeshi Hagikura 96c8509e4a am 3bb3da96: (-s ours) resolved conflicts for merge of 11e09fc0 to klp-modular-dev ...

* commit '3bb3da96ae60f6e1f1a9fef32c428a92b104c2cd':
  Deletes the wear samples that have been commited in the wrong place. Updates the location of wear samples in sdk.atree Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/564608)

2014-10-24 22:14:50 +00:00

apps

Import translations. DO NOT MERGE

2014-10-19 16:01:45 -07:00

build

Merge "Deletes the wear samples that have been commited in the wrong place. Updates the location of wear samples in sdk.atree Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/564608)" into lmp-dev

2014-10-22 20:25:18 +00:00

cmds/monkey

Update call to IActivityManager.startActivity.

2014-08-26 09:59:36 -07: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 SDK Windows USB driver: Project Tango pid

2014-09-15 10:36:09 -07:00

ide

Rename framework-base to framework in classpath.

2014-08-12 16:58:06 -07:00

libraries/stereocamera

Create the directory structure for adding the stereo camera

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

ndk

Remove out-dated android-20 and android-21 now called android-L

2014-09-04 11:28:30 -07:00

perftests/panorama

Build both 64- and 32-bit versions.

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

samples

Add browseable samples for Clockwork Beryl

2014-10-23 03:36:38 +00:00

scripts

Do not call art-on macro by default.

2014-10-03 17:31:41 -07:00

sdk

Update Build Tools version to <API>.0.2. DO NOT MERGE.

2014-10-21 09:18:45 -07:00

sdk_overlay

Add platform FLP for emulator config

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

sys-img

Package custom hardware.ini with armeabi-v7a images.

2014-06-19 17:16:00 -07:00

testrunner

Modify testrunner/test_defs.xml to delete obsolete cts tests

2014-10-20 12:13:16 -07:00

tools

Import translations. DO NOT MERGE

2014-10-19 09:47:23 -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%