Merge heads

This commit is contained in:
youtaol
2012-07-03 20:07:00 +08:00
parent ec74968f94
commit 4dddea507f
180 changed files with 1218 additions and 735 deletions
+6 -6
View File
@@ -72,18 +72,18 @@ limitations under the License.
<TextView
android:text="@string/help_share_friends_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_send_track_question"
style="@style/HelpQuestion" />
<TextView
android:id="@+id/help_send_track_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_maps_public_unlisted_question"
style="@style/HelpQuestion" />
<TextView
android:id="@+id/help_maps_public_unlisted_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_google_services_question"
style="@style/HelpQuestion" />
<TextView
android:id="@+id/help_google_services_answer"
style="@style/HelpAnswer" />
<TextView
android:text="@string/help_share_visibility_question"
style="@style/HelpQuestion" />