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

* commit '6b49c1e136f14008f12616250b6b70587d1199af':
  Initial empty repository