am da1db041: (-s ours) Merge remote-tracking branch \'origin/kitkat-dev\'

* commit 'da1db04101b57a1bad4b2f98f8898a0cf01f56e6':
  Initial empty repository