am a342336c: (-s ours) am ed058349: Merge "Fix bug in FAB action" into mnc-dev

* commit 'a342336c079de49b583f251728381ea9546d3c17':
tree: 8924d31ff2ecb8b544ab35dab62f515aac397156
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags