tree 5a005b4b901f8f7d0312e5870937270dab9ccfde
parent e25dfa5fd030bfc533462aaac9cf9b7f8833d496
parent 9b6a9aceae51d675306f256095a9972fcdbe596d
author Zhomart Mukhamejanov <zhomart@google.com> 1528934207 -0700
committer android-build-merger <android-build-merger@google.com> 1528934207 -0700

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

Change-Id: I91bef0b518749bf0f0f6cfb30bc9287d3876bef0