Jean-Baptiste Queru
|
303a8c73c9
|
Merge commit 'remotes/korg/cupcake'
Conflicts:
build/sdk.atree
ide/eclipse/.classpath
tools/activitycreator/src/com/android/activitycreator/ActivityCreator.java
tools/eclipse/scripts/create_adt_symlinks.sh
tools/eclipse/scripts/create_all_symlinks.sh
tools/eclipse/scripts/create_bridge_symlinks.sh
tools/eclipse/scripts/create_common_symlinks.sh
tools/eclipse/scripts/create_ddms_symlinks.sh
tools/eclipse/scripts/create_editors_symlinks.sh
tools/eclipse/scripts/create_test_symlinks.sh
tools/scripts/build.template
|
2008-12-19 08:04:59 -08:00 |
|
The Android Open Source Project
|
e943f2fd8e
|
Code drop from //branches/cupcake/...@124589
|
2008-12-17 18:04:04 -08:00 |
|
Alexey Zaytsev
|
62da4d9357
|
Add a few missing headers
Fixes build with gcc 4.3.2 on Debian.
Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
|
2008-10-22 02:03:57 +04:00 |
|
The Android Open Source Project
|
5c11852110
|
Initial Contribution
|
2008-10-21 07:00:00 -07:00 |
|