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

* commit '7b647317638b7061a90ee50d6c1ebb00b1ae795d':
  Initial empty repository