tree d2fb2ab1bb06e561e751f962c4e64f992ba5a680
parent ad22bcbf8de1a9bafc384c1bac46f3052605a066
parent 2cc87497c448ff83fbf66b223efb09dc3cc3aba8
author Zhomart Mukhamejanov <zhomart@google.com> 1529367997 -0700
committer android-build-merger <android-build-merger@google.com> 1529367997 -0700

Merge "updater_sample: add proguard.flags" am: 5af63a45d9 am: 468ad1d965
am: 2cc87497c4

Change-Id: I121f04b84aa23259fb696bdf9dfe756ff87609a4