Merge "Bugfix: Robolectric tests in Settings are broken" into pi-dev
tree: 6969a5817936f1806a2f3530332c5215a1db515b
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg