tree c7e68d9fc673fc4a767805c449fdb781d2006fe4
parent 899a5aec2bb15ec2da6538a78c699acc74c9c43d
parent 4c3dc8daa55b8dc07a36275c48ec7d64d2635170
author Brett Chabot <brettchabot@google.com> 1562196779 -0700
committer android-build-merger <android-build-merger@google.com> 1562196779 -0700

[automerger skipped] Merge "Migrate packages/apps/Email to androidx.test" am: 2fe2bc7ebc -s ours
am: 4c3dc8daa5 -s ours
am skip reason: change_id Id4f25bf324a564afbaf9c726ea97fa33074d8660 with SHA1 29260c13d9 is in history

Change-Id: I60e369d5efbd2766a75fe2755cfc8e80a010872a