Implement support for help library
b/12068507

Primary changes:

* Merge help and feedback as requested by the new guideline
* Determine help context by the view mode (list or conversation)

Change-Id: I6d9d7cc56063e7eedfe6db18c2c363e9b4d07cef
diff --git a/res/menu/compose_menu.xml b/res/menu/compose_menu.xml
index e7be1c4..7d5d3cc 100644
--- a/res/menu/compose_menu.xml
+++ b/res/menu/compose_menu.xml
@@ -55,13 +55,8 @@
         android:showAsAction="never" />
 
     <item
-        android:id="@+id/feedback_menu_item"
-        android:icon="@android:drawable/ic_menu_send"
-        android:title="@string/feedback" />
-
-    <item
         android:id="@+id/help_info_menu_item"
         android:icon="@android:drawable/ic_menu_help"
-        android:title="@string/help_and_info" />
+        android:title="@string/help_and_feedback" />
 
 </menu>