am 6b020e75: (-s ours) am 7c7ca5ea: (-s ours) Merge "Add egit. DO NOT MERGE"

* commit '6b020e75f0941ef6920e6f422ece4ada64c85b8a':
  Add egit. DO NOT MERGE