am 1e1d4492: am 218aa945: Merge change I6478884a into eclair-mr2

Merge commit '1e1d44924a334637f9fb47ca8796625bd86cb66a'

* commit '1e1d44924a334637f9fb47ca8796625bd86cb66a':
  Add string resource type inspection