tree e4ee5cbe49e136601570334e0a44fccada141142
parent 45f7fc96eea66ee1974cf40cc659586c36fa1bcc
parent e40fc0c804d2b01e6bb0e712ab1ef81582a7a6f2
author Andrew Lee <anwlee@google.com> 1408492679 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408492679 +0000

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.