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

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