* commit '8b22a343cef28618106edc8e2d3b35bb3dd4703a': (176 commits)
Increment version.
Increment version.
Fix sync window preference being added multiple times
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Fix IMAP delete handling
Fix tests
Quit dropping inline attachments on the floor
Add a placeholder flaky test.
Convert Email tests to use android-support-tests
Update the title for the oauth authentication screen
Fix temporary setup flow on tablets
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Add @SmallTest annotation to test classes so they get run in continuous
Fix some broken tests
Update version number
Fix unbounded async task creation in ADS
Mark otherwise unused method as @VisibleForTesting
...
2fae5b2abc