tree 8d1ed2df09d4cd0594c5a0297987b5fdff062098
parent 91dd4feefca29432f7cc53251af89d5341fc4035
parent 811baa37d38c578ab5ec9664b071f159310eb4b5
author Zhomart Mukhamejanov <zhomart@google.com> 1524804808 -0700
committer android-build-merger <android-build-merger@google.com> 1524804808 -0700

Merge "updater_sample: fix gen_update_config.py" am: 2573b6fa1c
am: 811baa37d3

Change-Id: Ib27fa8dbb7679ee0762923d1449ddded88403333