OSDN Git Service

am 67b438b1: am a218ebb0: am 9823f279: Merge "Implement default assist app setting...
authorXiyuan Xia <xiyuan@google.com>
Wed, 10 Jun 2015 17:47:59 +0000 (17:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Jun 2015 17:47:59 +0000 (17:47 +0000)
* commit '67b438b1185f6d11712ee9c962066c1651479507':
  Implement default assist app setting

1  2 
res/values/strings.xml

Simple merge