tree ba30f0338f3f98b8c300312da7073a4b4306b062
parent dbe703135d94c55fa7a1907856b8fa84e39866fc
parent 4996c3c1c5b0c30a44fa1e0414ba69b7e4daa559
author Scott Kennedy <skennedy@google.com> 1377235642 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377235642 -0700

am e407bff4: am 3be35a39: Remove some unused resources and imports

* commit 'e407bff4896dfe7f43fc955d35ee40b321b8cc83':
  Remove some unused resources and imports