tree d2fb2ab1bb06e561e751f962c4e64f992ba5a680
parent d05624fbe03d1b831aebe37bd5cd08047bfa0df1
parent 468ad1d965de5cc53c35a40625c6867202f1d3c7
author Zhomart Mukhamejanov <zhomart@google.com> 1529367453 -0700
committer android-build-merger <android-build-merger@google.com> 1529367453 -0700

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

Change-Id: Ib819331248fd0e799f3679f9663500cf897ca3b4