summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | * merge in lmp-mr1-release history after reset to 845b3b143c8a0a0758baad2cd0431...The Android Automerger2014-09-270-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to 845b3b143c8a0a0758baad2cd0431...The Android Automerger2014-09-250-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to 845b3b143c8a0a0758baad2cd0431...The Android Automerger2014-09-240-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to 845b3b143c8a0a0758baad2cd0431...The Android Automerger2014-09-230-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to 845b3b143c8a0a0758baad2cd0431...The Android Automerger2014-09-230-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to 845b3b143c8a0a0758baad2cd0431...The Android Automerger2014-09-220-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to 845b3b143c8a0a0758baad2cd0431...The Android Automerger2014-09-220-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to 845b3b143c8a0a0758baad2cd0431...The Android Automerger2014-09-220-0/+0
| | | | | |/|
| * | | | | | am 13ff526b: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-030-0/+0
| |\ \ \ \ \ \
| | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-0372-4025/+573
| * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-0372-4026/+574
| | |/ / / / / | |/| | | | |
| * | | | | | am 1c0662f9: fix bad mergePaul Westbrook2014-11-022-22/+0
| |\| | | | |
| | * | | | | fix bad mergePaul Westbrook2014-11-022-22/+0
| * | | | | | am 47ee4637: resolved conflicts for merge of 19809304 to lmp-sprout-devPaul Westbrook2014-11-0214-449/+42
| |\| | | | |
| | * | | | | resolved conflicts for merge of 19809304 to lmp-sprout-devPaul Westbrook2014-11-0214-449/+42
| | |\ \ \ \ \
| | | * \ \ \ \ Merge AOSP ur14 to lmp-devPaul Westbrook2014-10-280-0/+0
| | | |\ \ \ \ \
| * | | | | | | | am b188964b: (-s ours) am 96ade4e2: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-020-0/+0
| |\| | | | | | |
| | * | | | | | | am 96ade4e2: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-020-0/+0
| | |\| | | | | |
| | | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-271-1/+1
| * | | | | | | | am 67b60f66: am b57bca27: Default to encrypted connections (YAY!)Tony Mantler2014-11-021-4/+4
| |\| | | | | | |
| | * | | | | | | am b57bca27: Default to encrypted connections (YAY!)Tony Mantler2014-11-021-4/+4
| | |\| | | | | |
| | | * | | | | | Default to encrypted connections (YAY!)Tony Mantler2014-10-241-4/+4
| * | | | | | | | am 0f6acb54: am f0bbcd85: Add additional analytics regarding our SSLSocketsMartin Hibdon2014-11-021-2/+8
| |\| | | | | | |
| | * | | | | | | am f0bbcd85: Add additional analytics regarding our SSLSocketsMartin Hibdon2014-11-021-2/+8
| | |\| | | | | |
| | | * | | | | | Add additional analytics regarding our SSLSocketsMartin Hibdon2014-10-241-2/+8
| * | | | | | | | am 0e1bdee9: am 21dc44d2: Merge "Add analytics to track of what cipher suites...Martin Hibdon2014-11-022-1/+14
| |\| | | | | | |
| | * | | | | | | am 21dc44d2: Merge "Add analytics to track of what cipher suites are being us...Martin Hibdon2014-11-022-1/+14
| | |\| | | | | |
| | | * | | | | | Merge "Add analytics to track of what cipher suites are being used" into ub-g...Martin Hibdon2014-10-242-1/+14
| | | |\ \ \ \ \ \
| | | | * | | | | | Add analytics to track of what cipher suites are being usedMartin Hibdon2014-10-242-1/+14
| * | | | | | | | | am 85d0fdbe: am 303b553b: Allow an external security provider to be installedMartin Hibdon2014-11-021-7/+11
| |\| | | | | | | |
| | * | | | | | | | am 303b553b: Allow an external security provider to be installedMartin Hibdon2014-11-021-7/+11
| | |\| | | | | | |
| | | * | | | | | | Allow an external security provider to be installedMartin Hibdon2014-10-211-7/+11
| | | |/ / / / / /
| * | | | | | | | am be216a96: am a908d45a: Merge "Add deprecated cipher suites to our SSLSocke...Martin Hibdon2014-11-022-36/+284
| |\| | | | | | |
| | * | | | | | | am a908d45a: Merge "Add deprecated cipher suites to our SSLSocket" into ub-gm...Martin Hibdon2014-11-022-36/+284
| | |\| | | | | |
| | | * | | | | | Merge "Add deprecated cipher suites to our SSLSocket" into ub-gmail-ur14-devMartin Hibdon2014-10-212-36/+284
| | | |\ \ \ \ \ \
| | | | * | | | | | Add deprecated cipher suites to our SSLSocketMartin Hibdon2014-10-212-36/+284
| * | | | | | | | | am f85d9e08: am 9d73facf: Merge "Fix restoreBodySource key so it returns the ...Anthony Lee2014-11-021-4/+1
| |\| | | | | | | |
| | * | | | | | | | am 9d73facf: Merge "Fix restoreBodySource key so it returns the correct value...Anthony Lee2014-11-021-4/+1
| | |\| | | | | | |
| | | * | | | | | | Merge "Fix restoreBodySource key so it returns the correct value." into ub-gm...Anthony Lee2014-10-211-4/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fix restoreBodySource key so it returns the correct value.Anthony Lee2014-10-211-4/+1
| * | | | | | | | | | am d77bf0c6: am 764d7b2f: Merge "Disable smart foward/reply" into ub-gmail-ur...Martin Hibdon2014-11-021-1/+19
| |\| | | | | | | | |
| | * | | | | | | | | am 764d7b2f: Merge "Disable smart foward/reply" into ub-gmail-ur14-devMartin Hibdon2014-11-021-1/+19
| | |\| | | | | | | |
| | | * | | | | | | | Merge "Disable smart foward/reply" into ub-gmail-ur14-devMartin Hibdon2014-10-211-1/+19
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Disable smart foward/replyMartin Hibdon2014-10-211-1/+19
| | | | |/ / / / / /
| * | | | | | | | | am 34418383: (-s ours) am 98f764fb: (-s ours) Merge "Import translations. DO ...Geoff Mendal2014-11-020-0/+0
| |\| | | | | | | |
| | * | | | | | | | am 98f764fb: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmai...Geoff Mendal2014-11-020-0/+0
| | |\| | | | | | |
| | | * | | | | | | Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-devGeoff Mendal2014-10-202-3/+3
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-202-3/+3
| * | | | | | | | | | am 14286249: am d716d894: Don\'t assume mHostAuthRecv is loaded when checking...Tony Mantler2014-11-021-6/+18
| |\| | | | | | | | |
| | * | | | | | | | | am d716d894: Don\'t assume mHostAuthRecv is loaded when checking outgoingTony Mantler2014-11-021-6/+18
| | |\| | | | | | | |