commit c02c511220bcba40ba9479398a378cacf0076f2e
author Michael Wright <michaelwr@google.com> Tue Aug 26 19:50:19 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 26 19:50:19 2014 +0000
tree a10423c7ee80ba0bb6d7884ee47c19e3d862adf7
parent fe3ec1bcb3b1f9f0c6dde2f3d61d58fdbe2d4ee7
parent 15741d0e0b859484738e2d165e99f8f686230316

am 1d622f50: Merge "Add missing attr for KEYCODE_VOICE_ASSIST" into lmp-dev

* commit '1d622f508bbc10332b402359d0451dc80ed5d3a2':
  Add missing attr for KEYCODE_VOICE_ASSIST

core/res/res/values/attrs.xml

diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index e88fe0a..70238373 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -1713,6 +1713,7 @@
         <enum name="KEYCODE_12" value="228" />
         <enum name="KEYCODE_LAST_CHANNEL" value="229" />
         <enum name="KEYCODE_TV_DATA_SERVICE" value="230" />
+        <enum name="KEYCODE_VOICE_ASSIST" value="231" />
     </attr>
 
     <!-- ***************************************************************** -->