build: envsetup: add merge_upstream

Change-Id: I97feb109fc9fe5eb1c6738aaf1477d28681fb9a6
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
1 file changed
tree: 76538e25708c02e0678eaf1717373445509c4c93
  1. build/
  2. charger/
  3. config/
  4. prebuilt/
  5. .gitignore
  6. device-vendor.mk