am 8b22a343: merge in ub-mail-klp-mr2-release history after reset to ub-mail-klp-mr2

Browse Source

* 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
  ...

...

This commit is contained in:

The Android Automerger 2014-03-20 22:17:00 +00:00 committed by Android Git Automerger

parent b9f25c3182 8b22a343ce

commit 2fae5b2abc

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available