tree aa572b31d4f9ab0aeeb1d184442591c4a454e1aa
parent c01c31104c6db2416d57103c964d63111164e024
parent b0d7bee84d6fbc528364e01c066b5077444164c3
author Ian Pedowitz <ijpedowitz@google.com> 1528959283 -0700
committer android-build-merger <android-build-merger@google.com> 1528959283 -0700

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

Change-Id: I0cfc628e6735608fbc4c62dc150ebc05d470e133