commit cce3fc6e2354f8e7bc743eef4d74914dde7242b8
author Brian Attwell <brianattwell@google.com> Thu Jul 17 21:11:51 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 17 21:11:51 2014 +0000
tree 4d2bf16f76d83613c07a89a4ae0a869114573c21
parent f0c8cec22936c7c06426291d2fe8d959c32ff635
parent 75083ca446624e1db80ccfad269f43ce192833f8

am 75083ca4: am 59c27e07: am 4d5d8711: Merge "Content description on edit screen\'s menu_done" into lmp-dev

* commit '75083ca446624e1db80ccfad269f43ce192833f8':
  Content description on edit screen's menu_done

res/layout/editor_custom_action_bar.xml

diff --git a/res/layout/editor_custom_action_bar.xml b/res/layout/editor_custom_action_bar.xml
index 7a31b92..7764674 100644
--- a/res/layout/editor_custom_action_bar.xml
+++ b/res/layout/editor_custom_action_bar.xml
@@ -30,7 +30,7 @@
         android:layout_marginEnd="8dip"
         android:src="@drawable/ic_done_wht_24dp"
         style="?android:attr/actionButtonStyle"
-        android:description="@string/menu_done" />
+        android:contentDescription="@string/menu_done" />
 
     <TextView
         android:id="@+id/title"