c47cfb5d478e4b5d2397351722d51b26d21e8659 - platform/development

commit: c47cfb5d478e4b5d2397351722d51b26d21e8659
[log]
author: Andy Stadler <stadler@android.com>
Sat Sep 18 10:06:02 2010 -0700
committer: Android Git Automerger <android-git-automerger@android.com>
Sat Sep 18 10:06:02 2010 -0700
tree: 72615cdbd53533f9219dd50c399208a8bad040eb
parent: c54f778e92fe7231aab646d62054a2f92b62bdca [diff]
parent: 66ce420c325fe32a4da67f8a9a0914a093df2f42 [diff]

am 66ce420c: (-s ours) resolved conflicts for merge of 97903767 to gingerbread-plus-aosp

Merge commit '66ce420c325fe32a4da67f8a9a0914a093df2f42'

* commit '66ce420c325fe32a4da67f8a9a0914a093df2f42':
  Cleanups for eclipse classpath DO NOT MERGE

tree: 72615cdbd53533f9219dd50c399208a8bad040eb

apps/
build/
cmds/
data/
docs/
host/
ide/
ndk/
pdk/
samples/
scripts/
sdk/
sdk_overlay/
simulator/
testrunner/
tools/
tutorials/
.gitignore
CleanSpec.mk