tree 6ac4bcb70f163f12e35473b61067e2415cf58387
parent 1a72ba521775741cf77f2746ee544339a679a672
parent f0673662127c2d93aa1d77f510ee943e7c72736d
author Jean-Luc Brouillet <jeanluc@google.com> 1427397788 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427397788 +0000

am f0673662: Merge "Change the list of recognized .rsh files"

* commit 'f0673662127c2d93aa1d77f510ee943e7c72736d':
  Change the list of recognized .rsh files