summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cm-12.0' of git://github.com/CyanogenMod/android_packages_apps_...staging/cm-12.1Steve Kondik2015-03-3119-10/+423
|\
| * email: fix recents's suggested contacts queryJorge Ruesga2015-03-311-1/+1
| * email: fix back buttonJorge Ruesga2015-03-312-5/+3
| * Automatic translation importMichael Bestas2015-03-3114-1/+403
| * Improve stringsMichael Bestas2015-03-271-2/+2
| * UnifiedEmail: Increase max attachment size to 25MBLorDClockaN2015-03-221-2/+2
| * email: don't assume that onDrawerClose will be calledJorge Ruesga2015-03-191-3/+13
* | Merge tag 'android-5.1.0_r1' into merge-5.1Tom Marshall2015-03-13830-25372/+17070
|\ \ | |/ |/|
| * merge in lmp-mr1-release history after reset to c1b5d359dd97f9e0471694a1b3136...The Android Automerger2014-11-080-0/+0
| |\
| | * merge in lmp-mr1-release history after reset to c1b5d359dd97f9e0471694a1b3136...The Android Automerger2014-11-060-0/+0
| |/|
| | * merge in lmp-mr1-release history after reset to c1b5d359dd97f9e0471694a1b3136...The Android Automerger2014-11-050-0/+0
| |/|
| | * merge in lmp-mr1-release history after reset to c1b5d359dd97f9e0471694a1b3136...The Android Automerger2014-11-040-0/+0
| |/|
| | * merge in lmp-mr1-release history after reset to 9b555157a8ff9c5e4fb47987b18a7...The Android Automerger2014-11-030-0/+0
| | |\
| | | * merge in lmp-mr1-release history after reset to 531d63ebcffeb2ecb255bb6caa402...The Android Automerger2014-11-020-0/+0
| | | |\
| | | | * merge in lmp-mr1-release history after reset to 531d63ebcffeb2ecb255bb6caa402...The Android Automerger2014-11-010-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 531d63ebcffeb2ecb255bb6caa402...The Android Automerger2014-10-300-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 531d63ebcffeb2ecb255bb6caa402...The Android Automerger2014-10-290-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 531d63ebcffeb2ecb255bb6caa402...The Android Automerger2014-10-280-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 531d63ebcffeb2ecb255bb6caa402...The Android Automerger2014-10-270-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 531d63ebcffeb2ecb255bb6caa402...The Android Automerger2014-10-260-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 531d63ebcffeb2ecb255bb6caa402...The Android Automerger2014-10-250-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 531d63ebcffeb2ecb255bb6caa402...The Android Automerger2014-10-230-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 531d63ebcffeb2ecb255bb6caa402...The Android Automerger2014-10-220-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 531d63ebcffeb2ecb255bb6caa402...The Android Automerger2014-10-210-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 531d63ebcffeb2ecb255bb6caa402...The Android Automerger2014-10-200-0/+0
| | | |/|
| | | | * merge in lmp-mr1-release history after reset to 08bb365f204cf4508007676b73e0a...The Android Automerger2014-10-190-0/+0
| | | | |\
| | | | | * merge in lmp-mr1-release history after reset to 08bb365f204cf4508007676b73e0a...The Android Automerger2014-10-180-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 08bb365f204cf4508007676b73e0a...The Android Automerger2014-10-160-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 08bb365f204cf4508007676b73e0a...The Android Automerger2014-10-150-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 08bb365f204cf4508007676b73e0a...The Android Automerger2014-10-140-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 08bb365f204cf4508007676b73e0a...The Android Automerger2014-10-130-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 08bb365f204cf4508007676b73e0a...The Android Automerger2014-10-120-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 08bb365f204cf4508007676b73e0a...The Android Automerger2014-10-110-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 08bb365f204cf4508007676b73e0a...The Android Automerger2014-10-090-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 08bb365f204cf4508007676b73e0a...The Android Automerger2014-10-080-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 08bb365f204cf4508007676b73e0a...The Android Automerger2014-10-070-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 08bb365f204cf4508007676b73e0a...The Android Automerger2014-10-060-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 08bb365f204cf4508007676b73e0a...The Android Automerger2014-10-050-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 08bb365f204cf4508007676b73e0a...The Android Automerger2014-10-040-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 08bb365f204cf4508007676b73e0a...The Android Automerger2014-10-020-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 08bb365f204cf4508007676b73e0a...The Android Automerger2014-10-010-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to 08bb365f204cf4508007676b73e0a...The Android Automerger2014-09-300-0/+0
| | | | |/|
| | | | | * merge in lmp-mr1-release history after reset to a7675372b061c8fb56d38ce0c418e...The Android Automerger2014-09-290-0/+0
| | | | | |\
| | | | | | * merge in lmp-mr1-release history after reset to a7675372b061c8fb56d38ce0c418e...The Android Automerger2014-09-280-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to a7675372b061c8fb56d38ce0c418e...The Android Automerger2014-09-270-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to a7675372b061c8fb56d38ce0c418e...The Android Automerger2014-09-250-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to a7675372b061c8fb56d38ce0c418e...The Android Automerger2014-09-240-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to a7675372b061c8fb56d38ce0c418e...The Android Automerger2014-09-230-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to a7675372b061c8fb56d38ce0c418e...The Android Automerger2014-09-230-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to a7675372b061c8fb56d38ce0c418e...The Android Automerger2014-09-220-0/+0
| | | | | |/|