am e0848c0f: am d14cfc27: Merge change I9e384ddd into eclair

Merge commit 'e0848c0fc42de089d12b98dc8efeed5002686e40'

* commit 'e0848c0fc42de089d12b98dc8efeed5002686e40':
  Add a test pattern as rollo's icon