summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | am c687312a: (-s ours) am 2d64aeb0: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-040-0/+0
| | |\ \
| | | * \ am 2d64aeb0: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-040-0/+0
| | | |\ \
| | | | * | Import translations. DO NOT MERGEGeoff Mendal2014-11-0370-93/+22
* | | | | | am fa394a08: (-s ours) am 7e9bc5a3: (-s ours) am 763dd29b: (-s ours) Import t...Geoff Mendal2014-11-040-0/+0
|\| | | | |
| * | | | | am 7e9bc5a3: (-s ours) am 763dd29b: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-040-0/+0
| |\| | | |
| | * | | | am 763dd29b: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-040-0/+0
| | |\| | |
| | | * | | Import translations. DO NOT MERGEGeoff Mendal2014-11-0370-93/+22
* | | | | | am 1fa5fe29: (-s ours) am 9fe9a884: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-040-0/+0
|\| | | | |
| * | | | | am 9fe9a884: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-040-0/+0
| |\| | | |
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-0354-72/+18
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-0371-73/+1
* | | | | | resolved conflicts for merge of 62c8c8e3 to masterPaul Westbrook2014-11-021-1/+0
|\| | | | |
| * | | | | resolved conflicts for merge of faa54a83 to lmp-mr1-dev-plus-aospPaul Westbrook2014-11-021-47/+46
| |\| | | |
| | * | | | am 90c6294f: am 7d118538: resolved conflicts for merge of 94fc01dc to lmp-spr...Paul Westbrook2014-11-022-3/+1
| | |\| | |
| | | * | | am 7d118538: resolved conflicts for merge of 94fc01dc to lmp-sprout-devPaul Westbrook2014-11-022-3/+1
| | | |\| |
| | | | * | resolved conflicts for merge of 94fc01dc to lmp-sprout-devPaul Westbrook2014-11-022-3/+1
| | | | |\ \
| | | | | * \ Merge AOSP ur14 to lmp-devPaul Westbrook2014-10-280-0/+0
| | | | | |\ \
* | | | | | | | am 8607b635: am 59edc74a: am 27443729: am a34e767d: am 55fca1c9: Merge "Incre...Martin Hibdon2014-11-021-1/+1
|\| | | | | | |
| * | | | | | | am 59edc74a: am 27443729: am a34e767d: am 55fca1c9: Merge "Increment Exchange...Martin Hibdon2014-11-021-1/+1
| |\| | | | | |
| | * | | | | | am 27443729: am a34e767d: am 55fca1c9: Merge "Increment Exchange version" int...Martin Hibdon2014-11-021-1/+1
| | |\| | | | |
| | | * | | | | am a34e767d: am 55fca1c9: Merge "Increment Exchange version" into ub-gmail-ur...Martin Hibdon2014-11-021-1/+1
| | | |\| | | |
| | | | * | | | am 55fca1c9: Merge "Increment Exchange version" into ub-gmail-ur14-devMartin Hibdon2014-11-021-1/+1
| | | | |\| | |
| | | | | * | | Merge "Increment Exchange version" into ub-gmail-ur14-devMartin Hibdon2014-10-211-1/+1
| | | | | |\ \ \
| | | | | | * | | Increment Exchange versionMartin Hibdon2014-10-211-1/+1
* | | | | | | | | am 0eec4f00: am 146ac38e: am fdeeae28: am e20b0206: am 19ada70d: Add more log...Anthony Lee2014-11-021-8/+13
|\| | | | | | | |
| * | | | | | | | am 146ac38e: am fdeeae28: am e20b0206: am 19ada70d: Add more logging around E...Anthony Lee2014-11-021-8/+13
| |\| | | | | | |
| | * | | | | | | am fdeeae28: am e20b0206: am 19ada70d: Add more logging around EAS SmartSend ...Anthony Lee2014-11-021-8/+13
| | |\| | | | | |
| | | * | | | | | am e20b0206: am 19ada70d: Add more logging around EAS SmartSend to debug pote...Anthony Lee2014-11-021-8/+13
| | | |\| | | | |
| | | | * | | | | am 19ada70d: Add more logging around EAS SmartSend to debug potential issues.Anthony Lee2014-11-021-8/+13
| | | | |\| | | |
| | | | | * | | | Add more logging around EAS SmartSend to debug potential issues.Anthony Lee2014-10-211-8/+13
* | | | | | | | | am aa0eadcc: am 12a12e7c: am ae796083: am a993369c: am 0ceec56a: Merge "If an...Martin Hibdon2014-11-022-2/+6
|\| | | | | | | |
| * | | | | | | | am 12a12e7c: am ae796083: am a993369c: am 0ceec56a: Merge "If an account does...Martin Hibdon2014-11-022-2/+6
| |\| | | | | | |
| | * | | | | | | am ae796083: am a993369c: am 0ceec56a: Merge "If an account does not support ...Martin Hibdon2014-11-022-2/+6
| | |\| | | | | |
| | | * | | | | | am a993369c: am 0ceec56a: Merge "If an account does not support smart forward...Martin Hibdon2014-11-022-2/+6
| | | |\| | | | |
| | | | * | | | | am 0ceec56a: Merge "If an account does not support smart forward, then it doe...Martin Hibdon2014-11-022-2/+6
| | | | |\| | | |
| | | | | * | | | Merge "If an account does not support smart forward, then it doesn't do smart...Martin Hibdon2014-10-212-2/+6
| | | | | |\ \ \ \
| | | | | | * | | | If an account does not support smart forward, then it doesn't do smart reply ...Martin Hibdon2014-10-212-2/+6
| | | | | | |/ / /
* | | | | | | | | am f3f340da: (-s ours) am 0ab91dff: (-s ours) am 72ce29ff: (-s ours) am 68987...Geoff Mendal2014-11-020-0/+0
|\| | | | | | | |
| * | | | | | | | am 0ab91dff: (-s ours) am 72ce29ff: (-s ours) am 6898763f: (-s ours) am ad9ce...Geoff Mendal2014-11-020-0/+0
| |\| | | | | | |
| | * | | | | | | am 72ce29ff: (-s ours) am 6898763f: (-s ours) am ad9ce7ad: (-s ours) Import t...Geoff Mendal2014-11-020-0/+0
| | |\| | | | | |
| | | * | | | | | am 6898763f: (-s ours) am ad9ce7ad: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-020-0/+0
| | | |\| | | | |
| | | | * | | | | am ad9ce7ad: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-020-0/+0
| | | | |\| | | |
| | | | | * | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-202-3/+3
* | | | | | | | | am 5b5ba82c: (-s ours) am 1d43fdb1: (-s ours) am 5eed3f4f: (-s ours) am 1223f...Baligh Uddin2014-11-020-0/+0
|\| | | | | | | |
| * | | | | | | | am 1d43fdb1: (-s ours) am 5eed3f4f: (-s ours) am 1223f944: (-s ours) am 03f9c...Baligh Uddin2014-11-020-0/+0
| |\| | | | | | |
| | * | | | | | | am 5eed3f4f: (-s ours) am 1223f944: (-s ours) am 03f9cf8e: (-s ours) Import t...Baligh Uddin2014-11-020-0/+0
| | |\| | | | | |
| | | * | | | | | am 1223f944: (-s ours) am 03f9cf8e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-11-020-0/+0
| | | |\| | | | |
| | | | * | | | | am 03f9cf8e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-11-020-0/+0
| | | | |\| | | |
| | | | | * | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-193-23/+23
| | | | | |/ / /
* | | | | | | | am 50554946: am 0c93c0f7: am f464ee2a: am 0d60456a: am 71d81d4e: Merge "Add l...Martin Hibdon2014-11-021-0/+1
|\| | | | | | |