tree 0fde0593dc7fd6db3bd8132eb3f42c0967a8f9b0
parent edcc4754ee50d97baf15442e9f1ef10ea299aae5
parent 285ee4b3b009d80683a5188b71ba125dd94e6cf7
author Andy Stadler <stadler@google.com> 1337209922 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337209922 -0700

am 285ee4b3: Merge "Fix .classpath for eclipse.  DO NOT MERGE" into jb-dev

* commit '285ee4b3b009d80683a5188b71ba125dd94e6cf7':
  Fix .classpath for eclipse.  DO NOT MERGE