tree 22ab79fe65e47d88084efb68e6ca3f56ddb81948
parent 74776966e4513d5b0bf314e59cf1cbb6659113c5
parent 527a7e9048f915bc3c9e664c8237d45b03435079
author Tobias Thierer <tobiast@google.com> 1536823671 -0700
committer android-build-merger <android-build-merger@google.com> 1536823671 -0700

Merge "UnifiedEmail: Fix proguard rule."
am: 527a7e9048

Change-Id: I7729862a49ec2388430ab2e801361b90910b8542