Merge branch 'stable-2.15'

* stable-2.15:
  At least get tests compiling properly

Change-Id: Iecbd178c51bdccdab9013a1027422739f164c15e
tree: e4725c68570c8c64f1077039b0c0ce2e22f609ff
  1. .gitignore
  2. .settings/
  3. BUILD
  4. LICENSE
  5. src/