tree 7ad9e8e20439132b0c3c97d8260bd8231e5c279a
parent 01f044b07a7c90d2b87f5cc31b363326134dfc7c
parent 4bb312c7f3997fb619acb40c7622a455ef5c4f2c
author Tadashi G. Takaoka <takaoka@google.com> 1366958864 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366958864 -0700

am 4bb312c7: Merge "Add strings-appname.xml to AOSP Android Keyboard project"

* commit '4bb312c7f3997fb619acb40c7622a455ef5c4f2c':
  Add strings-appname.xml to AOSP Android Keyboard project