am ff3cab97: am ce412673: Merge "Remove hardcoded class name from test" into lmp-dev

* commit 'ff3cab97fa7dbb78d8875f81958b09c5d293d561':
  Remove hardcoded class name from test
tree: 89d7f36ee290a3bb01f93d426e312fdd77c6b773
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags