tree 5a005b4b901f8f7d0312e5870937270dab9ccfde
parent 903a91f7f45e495ed2b69116c358459575747e98
parent 441f38e9e523ed78a1d71f3ad70c4195a955ef2d
author Zhomart Mukhamejanov <zhomart@google.com> 1528936499 -0700
committer android-build-merger <android-build-merger@google.com> 1528936499 -0700

Merge "updater_sample: add proguard.flags" am: 5ced47d120 am: 9b6a9aceae
am: 441f38e9e5

Change-Id: I08bd1360a9c7301c513110f00015d6f31314591e