OSDN Git Service

am bb8196ad: am 36d0e2b9: Add Flic smart button to interop database
authorAndre Eisenbach <eisenbach@google.com>
Mon, 19 Oct 2015 21:12:04 +0000 (21:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2015 21:12:04 +0000 (21:12 +0000)
* commit 'bb8196ad8e20ad21da8a95ede61d396393689e70':
  Add Flic smart button to interop database


Trivial merge