tree aa572b31d4f9ab0aeeb1d184442591c4a454e1aa
parent a17782bbf8f07867e44a74cebec7a4fbbf819dd2
parent 888dae6c132ffef25c01e775f0a7fac906a14f9d
author Ian Pedowitz <ijpedowitz@google.com> 1528959021 -0700
committer android-build-merger <android-build-merger@google.com> 1528959021 -0700

Merge "Revert "updater_sample: add proguard.flags"" am: ac752b3ed8
am: 888dae6c13

Change-Id: I0ce9c1daf2761d72b99a7f996b661f0646308efc