Skip to content
Commit 1b4e8b72 authored by Sasha Smundak's avatar Sasha Smundak
Browse files

Merge remote-tracking branch 'upstream/master' into upstream_merge 

* upstream/master:
  Implement list of maps

Test: internal tests are run during 'm nothing'
Change-Id: I48723e00501de59c3d0946b6031de50957e313f7
parents 59a3a23e 86497ca7
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment