am c2c4a76e: am 46060c08: am 8d6a35c1: (-s ours) am f36d0119: am f2b91719: Merge "Fix Eclipse .classpath file for JB."

* commit 'c2c4a76eeb3bece02f015436b253b608bdcc31fd':
  Fix Eclipse .classpath file for JB.