am 06ef1d21: am 9f0fa1f4: Merge branch \'eclair-mr2\' of...

am 06ef1d21: am 9f0fa1f4: Merge branch \'eclair-mr2\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2

Merge commit '06ef1d2104b4c90d5b134ae17e2562fd6bedda17'

* commit '06ef1d2104b4c90d5b134ae17e2562fd6bedda17':
  Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.