am 040210f8: am 85760396: Merge "Pass in floating action button to controller." into lmp-dev

* commit '040210f88bf7ede1382d4fc556496b825c96994e':
  Pass in floating action button to controller.
tree: 0f5afe3b46d7c38781a552273fd5c7e0a8631325
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags