Raphael 6dcf42149b resolved conflicts for merge of 0da4f158 to eclair ...

Fixes a merge eclair-sdk => eclair conflict of
  SDK Manager: phase 1 of support for future schemas
  SDK BUG 2252825

Change-Id: I7530bdb7315439416abad114ef59208f8d4b3ab8

2009-11-16 13:07:43 -08:00

..

app

SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts

2009-11-02 16:43:32 -08:00

libs

resolved conflicts for merge of 0da4f158 to eclair

2009-11-16 13:07:43 -08:00

.gitignore

Split development/.gitignore into separate gitignore files per project.

2009-04-26 18:12:36 -07:00

Android.mk

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -08:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -08:00