summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-10-25Merge "Merge commit 'android-4.1.2_r1' into upgrade_branch"M8974AAAAANLYA0003041M8064AAAAANLYA1098M8064AAAAANLYA109708M8064AAAAANLYA109707M8064AAAAANLYA109706M8064AAAAANLYA109705M8064AAAAANLYA109704M8064AAAAANLYA109703M8064AAAAANLYA109702M8064AAAAANLYA109701M8064AAAAANLYA1097M8064AAAAANLYA109604M8064AAAAANLYA109603M8064AAAAANLYA109602M8064AAAAANLYA109601M8064AAAAANLYA1096M8064AAAAANLYA1095M8064AAAAANLYA109001M8064AAAAANLYA1090M8064AAAAANLYA108503M8064AAAAANLYA108502M8064AAAAANLYA108501M8064AAAAANLYA1085M8064AAAAANLYA1080AU_LINUX_ANDROID_JB_RB1.04.01.01.03.049AU_LINUX_ANDROID_JB_RB1.04.01.01.03.046AU_LINUX_ANDROID_JB_RB1.04.01.01.03.045AU_LINUX_ANDROID_JB_RB1.04.01.01.03.044AU_LINUX_ANDROID_JB_RB1.04.01.01.03.043AU_LINUX_ANDROID_JB_RB1.04.01.01.03.041AU_LINUX_ANDROID_JB_RB1.04.01.01.03.040AU_LINUX_ANDROID_JB_RB1.04.01.01.03.039AU_LINUX_ANDROID_JB_RB1.04.01.01.03.037AU_LINUX_ANDROID_JB_RB1.04.01.01.03.035AU_LINUX_ANDROID_JB_RB1.04.01.01.03.034AU_LINUX_ANDROID_JB_RB1.04.01.01.03.033AU_LINUX_ANDROID_JB_RB1.04.01.01.03.032AU_LINUX_ANDROID_JB_RB1.04.01.01.03.031AU_LINUX_ANDROID_JB_2.3_RB2.04.01.01.068.019AU_LINUX_ANDROID_JB_2.3_RB2.04.01.01.068.018AU_LINUX_ANDROID_JB_2.3_RB2.04.01.01.068.012AU_LINUX_ANDROID_JB_2.3_RB2.04.01.01.068.009AU_LINUX_ANDROID_JB_2.3_RB2.04.01.01.068.006AU_LINUX_ANDROID_JB_2.3_RB2.04.01.01.068.003AU_LINUX_ANDROID_JB_2.3_RB1.04.01.01.57.003AU_LINUX_ANDROID_JB_2.3.04.01.01.32.164AU_LINUX_ANDROID_JB_2.3.04.01.01.32.159AU_LINUX_ANDROID_JB_2.3.04.01.01.32.123AU_LINUX_ANDROID_JB_2.3.04.01.01.32.110AU_LINUX_ANDROID_JB_2.3.04.01.01.32.097AU_LINUX_ANDROID_JB_2.3.04.01.01.32.079AU_LINUX_ANDROID_JB_2.3.04.01.01.32.054AU_LINUX_ANDROID_JB_2.3.04.01.01.32.040AU_LINUX_ANDROID_JB_2.3.04.01.01.32.019AU_LINUX_ANDROID_JB_2.3.04.01.01.032.263AU_LINUX_ANDROID_JB_2.3.04.01.01.032.249AU_LINUX_ANDROID_JB_2.3.04.01.01.032.229AU_LINUX_ANDROID_JB_2.3.04.01.01.032.213AU_LINUX_ANDROID_JB_2.3.04.01.01.032.197AU_LINUX_ANDROID_JB_2.3.04.01.01.032.192AU_LINUX_ANDROID_JB_2.3.04.01.01.032.180AU_LINUX_ANDROID_JB_2.3.04.01.01.032.172AU_LINUX_ANDROID_JB.04.01.01.00.303AU_LINUX_ANDROID_JB.04.01.01.00.290AU_LINUX_ANDROID_JB.04.01.01.00.289AU_LINUX_ANDROID_JB.04.01.01.00.288AU_LINUX_ANDROID_JB.04.01.01.00.287AU_LINUX_ANDROID_JB.04.01.01.00.282AU_LINUX_ANDROID_JB.04.01.01.00.281AU_LINUX_ANDROID_JB.04.01.01.00.280AU_LINUX_ANDROID_JB.04.01.01.00.279AU_LINUX_ANDROID_JB.04.01.01.00.278AU_LINUX_ANDROID_JB.04.01.01.00.277AU_LINUX_ANDROID_JB.04.01.01.00.276AU_LINUX_ANDROID_JB.04.01.01.00.275AU_LINUX_ANDROID_JB.04.01.01.00.274AU_LINUX_ANDROID_JB.04.01.01.00.273AU_LINUX_ANDROID_JB.04.01.01.00.272AU_LINUX_ANDROID_JB.04.01.01.00.264AU_LINUX_ANDROID_JB.04.01.01.00.263AU_LINUX_ANDROID_JB.04.01.01.00.262AU_LINUX_ANDROID_JB.04.01.01.00.261AU_LINUX_ANDROID_JB.04.01.01.00.260AU_LINUX_ANDROID_JB.04.01.01.00.259AU_LINUX_ANDROID_JB.04.01.01.00.238AU_LINUX_ANDROID_JB.04.01.01.00.237AU_LINUX_ANDROID_JB.04.01.01.00.235AU_LINUX_ANDROID_JB.04.01.01.00.234AU_LINUX_ANDROID_JB.04.01.01.00.229AU_LINUX_ANDROID_JB.04.01.01.00.228AU_LINUX_ANDROID_JB.04.01.01.00.226AU_LINUX_ANDROID_JB.04.01.01.00.224AU_LINUX_ANDROID_JB.04.01.01.00.223AU_LINUX_ANDROID_JB.04.01.01.00.219AU_LINUX_ANDROID_JB.04.01.01.00.218AU_LINUX_ANDROID_JB.04.01.01.00.209jb_rb1.14jb_rb1.13jb_rb1.12jb_rb1.11jb_2.3_rb2.2jb_2.3_rb1.2jb_2.3.2Linux Build Service Account0-0/+0
2012-10-15Merge commit 'android-4.1.2_r1' into upgrade_branchJessica Gonzalez0-0/+0
2012-09-29Merge "Merge commit 'android-4.1.1_r6' into branch_upgrade"M8974AAAAANLYA0003030M8974AAAAANLYA0003028M8064AAAAANLYA1076M8064AAAAANLYA107001M8064AAAAANLYA1070AU_LINUX_ANDROID_JB_RB1.04.01.01.03.028AU_LINUX_ANDROID_JB_RB1.04.01.01.03.027AU_LINUX_ANDROID_JB_RB1.04.01.01.03.025AU_LINUX_ANDROID_JB_RB1.04.01.01.03.024AU_LINUX_ANDROID_JB.04.01.01.00.200AU_LINUX_ANDROID_JB.04.01.01.00.198AU_LINUX_ANDROID_JB.04.01.01.00.196AU_LINUX_ANDROID_JB.04.01.01.00.195jb_rb2.4jb_rb2.3jb_rb1.9jb_rb1.8jb_rb1.10Linux Build Service Account0-0/+0
2012-09-27Merge commit 'android-4.1.1_r6' into branch_upgradeJessica Gonzalez0-0/+0
2012-08-07Merge commit 'android-4.1.1_r4' into HEADM8974AAAAANLYA0003015M8974AAAAANLYA0003013M8960AAAAAYA20041014M8960AAAAANLYA2222AM8960AAAAANLYA2221M8960AAAAANLYA2220M8960AAAAANLYA2214006M8960AAAAANLYA2207M8960AAAAANLYA20234M8960AAAAANLYA20233M8960AAAAANLYA20232M8960AAAAANLYA20231002M8960AAAAANLYA20231M8960AAAAANLYA20230M8960AAAAANLYA2023M8960AAAAANLYA2022M8960AAAAANLYA2021M8960AAAAANLYA20203M8960AAAAANLYA2020M8960AAAAANLYA2005M8960AAAAANLYA2004AM8960AAAAANLYA20041011M8960AAAAANLYA2004M8960AAAAANLYA1734JM8960AAAAANLYA17341JM8960AAAAANLYA1732JM8960AAAAANLYA17321JM8960AAAAANLYA1731JM8960AAAAANLYA17302JM8960AAAAANLYA113111M8960AAAAANLYA113110M8960AAAAANLYA113109M8960AAAAANLYA113108M8960AAAAANLYA113106M8960AAAAANLYA113101EM8960AAAAANLYA113101DM8960AAAAANLYA113101CM8960AAAAANLYA113101BM8960AAAAANLYA113101AM8960AAAAANLYA113101M8960AAAAANLYA106303M8960AAAAANLYA106302M8960AAAAANLYA1063M8960AAAAANLYA0081M8930AAAAANLYA2229004M8930AAAAANLYA2224004M8930AAAAANLYA2217011M8930AAAAANLYA2217009M8930AAAAANLYA2214013M8930AAAAANLYA2013003M8930AAAAANLYA2002101M8930AAAAANLYA2002091M8930AAAAANLYA2002062M8930AAAAANLYA2002039M8930AAAAANLYA0000082M8625SSNSKMLYA20301CM8625SSNSKMLYA20301BM8625SSNSKMLYA2030M8625SSNSKMLYA2028M8625SSNSKMLYA2027M8625SSNSKMLYA2025M8625SSNSKMLYA2020M8625SSNSKMLYA2010M8625SSNSKMLYA1235M8625SSNSKMLYA1230M8625SSNSKMLYA1225M8260AAABQNLZA313060M8260AAABQNLZA313055M8260AAABQNLZA313050M8260AAABQNLZA313045M8260AAABQNLZA223025M8260AAABQNLZA223020M8260AAABQNLZA223015M8064AAAAANLYA1065M8064AAAAANLYA1061M76XXUSNEKNLYA2535M76XXUSNEKNLYA2530M76XXUSNEKNLYA2525M76XXUSNEKNLYA1740M76XXUSNEKNLYA1735M76XXUSNEKNLYA1730M76XXUSNEKNLYA1725M76XXUSNEKNLYA1720M7630AABBQMLZA41601040M7630AABBQMLZA41601030M7630AABBQMLZA41601020M7630AABBQMLZA41601000M7630AABBQMLZA40701050M7630AABBQMLZA40701040M7630AABBQMLZA40701030M7630AABBQMAZM414012AU_LINUX_ANDROID_JB_REL_RB2.04.01.01.12.003AU_LINUX_ANDROID_JB_REL_RB2.04.01.01.12.002AU_LINUX_ANDROID_JB_REL_RB2.04.01.01.12.001AU_LINUX_ANDROID_JB_REL_2.0.3_RB2.04.01.01.39.002AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.01.21.014AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.01.21.013AU_LINUX_ANDROID_JB_REL_2.0.3.04.01.01.21.001AU_LINUX_ANDROID_JB_REL_2.0.0.1_RB1.04.01.01.116.004AU_LINUX_ANDROID_JB_REL_2.0.0.1_RB1.04.01.01.116.001AU_LINUX_ANDROID_JB_REL_2.0.0.1.04.01.01.41.039AU_LINUX_ANDROID_JB_REL_2.0.0.1.04.01.01.41.037AU_LINUX_ANDROID_JB_REL_2.0.0.1.04.01.01.41.028AU_LINUX_ANDROID_JB_REL_2.0.0.1.04.01.01.41.027AU_LINUX_ANDROID_JB_REL_2.0.0.1.04.01.01.41.024AU_LINUX_ANDROID_JB_REL_2.0.0.1.04.01.01.41.021AU_LINUX_ANDROID_JB_REL_2.0.0.1.04.01.01.41.004AU_LINUX_ANDROID_JB_REL_2.0.0.1.04.01.01.41.002AU_LINUX_ANDROID_JB_REL_2.0.0.1.04.01.01.041.047AU_LINUX_ANDROID_JB_REL.04.01.01.02.131AU_LINUX_ANDROID_JB_REL.04.01.01.02.028AU_LINUX_ANDROID_JB_2.2_RB2_2.04.01.01.29.004AU_LINUX_ANDROID_JB_2.2_RB2.04.01.01.17.024AU_LINUX_ANDROID_JB_2.2_RB2.04.01.01.17.023AU_LINUX_ANDROID_JB_2.2_RB2.04.01.01.17.022AU_LINUX_ANDROID_JB_2.2_RB2.04.01.01.17.021A8064AAAAANLYA20113004A8064AAAAANLYA1611A8064AAAAANLYA1514A8064AAAAANLYA1513A8064AAAAANLYA1332A8064AAAAANLYA1331A8064AAAAANLYA1330AA8064AAAAANLYA1330A8064AAAAANLYA1322AA8064AAAAANLYA1322A8064AAAAANLYA1321A8064AAAAANLYA1320A8064AAAAANLYA1030542A8064AAAAANLYA103053A8064AAAAANLYA103052A8064AAAAANLYA103051A8064AAAAANLYA103050A8064AAAAANLYA103040A8064AAAAANLYA103030A8064AAAAANLYA103020A8064AAAAANLYA103010A8064AAAAANLYA10201A8064AAAAANLYA101034A8064AAAAANLYA101033A8064AAAAANLYA101032A8064AAAAANLYA101031A8064AAAAANLYA101030BA8064AAAAANLYA101030A8064AAAAANLYA101015jb_rel_rb6.1jb_rel_rb5.1jb_rel_rb4.1jb_rel_rb3_1.1jb_rel_rb2.1jb_rel_2.0.3_rb2.1jb_rel_2.0.2jb_rel_2.0.0.1_rb1jb_rel_2.0.0.1jb_rb4.1jb_rb3.3jb_rb3.2jb_rb3.1jb_rb2.2jb_rb1.7jb_rb1.6jb_chocolate_rb2.1jb_chocolate_rb1.2jb_chocolate_rb1.1jb_2.2_rb2_2.2jb_2.2_rb2_2.1jb_2.2_rb2_1.1jb_2.2_rb2.2Jessica Gonzalez1-4/+7
2012-08-03Reconcile AOSP and GOOG jb-releaseandroid-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5aosp-new/jb-releaseThe Android Open Source Project0-0/+0
2012-08-03Don't set DPM password expiration unless it has changedandroid-4.1.1_r4Marc Blank1-4/+7
2012-07-24Don't set DPM password expiration unless it has changedMarc Blank1-4/+7
2012-07-24merge in jb-release history after reset to jb-devThe Android Automerger0-0/+0
2012-07-24Don't set DPM password expiration unless it has changedMarc Blank1-4/+7
2012-07-17merge in jb-mr0-release history after reset to jb-devandroid-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1aosp-new/jb-mr0-releaseThe Android Automerger0-0/+0
2012-07-13Don't set DPM password expiration unless it has changedandroid-cts-4.1_r4android-cts-4.1_r2aosp-new/jb-devMarc Blank1-4/+7
2012-06-11merge in jb-release history after reset to jb-devandroid-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1M8974AAAAANLYA0000036M8960AAAAANLYA2205M8960AAAAANLYA2003M8960AAAAANLYA17301JM8960AAAAANLYA1723JM8960AAAAANLYA1074JM8960AAAAANLYA10741JM8960AAAAANLYA100713PM8960AAAAANLYA100713OM8960AAAAANLYA100713NM8960AAAAANLYA100713MM8960AAAAANLYA100713LM8960AAAAANLYA100713KM8960AAAAANLYA100713JM8930AAAAANLYA2002021M8930AAAAANLYA2002018M8930AAAAANLYA1030JM8930AAAAANLYA1021JM8625SSNSKMLYA1220M8625SSNSKMLYA1215M8625SSNSKMLYA1210M8260AAABQNLZA313040M8260AAABQNLZA313035M8260AAABQNLZA313030M8260AAABQNLZA223010M8064AAAAANLYA1060M76XXUSNEKNLYA2520M76XXUSNEKNLYA2515M76XXUSNEKNLYA2510M7630AABBQMLZA40701020M7630AABBQMLZA40701010M7630AABBQMLZA40701000AU_LINUX_ANDROID_JB_REL_RB1.04.01.01.06.003AU_LINUX_ANDROID_JB_REL_RB1.04.01.01.06.002A8064AAAAANLYA1313A8064AAAAANLYA1312A8064AAAAANLYA101014A8064AAAAANLYA101013A8064AAAAANLYA101012A8064AAAAANLYA101011jb_rel_rb1.1jb_rb2.1jb_chocolateThe Android Automerger0-0/+0
2012-06-07Don't look for account id when coming from Settingsandroid-cts-4.1_r1Marc Blank1-58/+9
2012-06-06merge in jb-release history after reset to jb-devThe Android Automerger0-0/+0
2012-06-05Import translations. DO NOT MERGEEric Fischer1-2/+2
2012-06-05merge in jb-release history after reset to jb-devThe Android Automerger0-0/+0
2012-06-04Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer1-6/+6
2012-06-04Import translations. DO NOT MERGEEric Fischer1-6/+6
2012-06-04Merge "DO NOT MERGE: Fix OOM crash" into jb-devMarc Blank1-1/+0
2012-06-04DO NOT MERGE: Fix OOM crashMarc Blank1-1/+0
2012-06-03merge in jb-release history after reset to jb-devThe Android Automerger0-0/+0
2012-06-02Merge "Fix crash when check settings finishes while paused" into jb-devMarc Blank1-4/+19
2012-06-02Fix crash when check settings finishes while pausedMarc Blank1-4/+19
2012-06-01Merge "Restore v20->v21, v27->v28 database upgrade code" into jb-devMarc Blank1-0/+16
2012-06-01Restore v20->v21, v27->v28 database upgrade codeMarc Blank1-0/+16
2012-06-01Import translations. DO NOT MERGEEric Fischer1-1/+1
2012-05-31Fix inappropriate "Loading..." stateMarc Blank1-4/+3
2012-05-31Fix inappropriate "Loading..." stateMarc Blank1-4/+3
2012-05-30merge in jb-release history after reset to jb-devThe Android Automerger0-0/+0
2012-05-29Import translations. DO NOT MERGEEric Fischer1-1/+1
2012-05-29merge in jb-release history after reset to jb-devThe Android Automerger0-0/+0
2012-05-25Merge "Import translations. DO NOT MERGE" into jb-devEric Fischer10-37/+36
2012-05-25Import translations. DO NOT MERGEEric Fischer10-37/+36
2012-05-25Merge "Don't need to override this; never did" into jb-devMindy Pereira1-5/+0
2012-05-25Don't need to override this; never didMindy Pereira1-5/+0
2012-05-24merge in jb-release history after reset to jb-devThe Android Automerger0-0/+0
2012-05-23Merge "Updating launcher icon to fix alignment. Bug: 6511716" into jb-devChristian Robertson3-0/+0
2012-05-23Updating launcher icon to fix alignment. Bug: 6511716Christian Robertson3-0/+0
2012-05-23If we are re-opening a forwarding draft, don't clear recipients.Mindy Pereira1-1/+4
2012-05-23merge in jb-release history after reset to jb-devThe Android Automerger0-0/+0
2012-05-22Merge "Fix the position of the buttons so that they dont look cut off." into ...Mindy Pereira5-16/+27
2012-05-22Fix the position of the buttons so that they dont look cut off.Mindy Pereira5-16/+27
2012-05-22Merge "Move refresh icon after show all folders." into jb-devMindy Pereira1-8/+8
2012-05-22Move refresh icon after show all folders.Mindy Pereira1-8/+8
2012-05-22merge in jb-release history after reset to jb-devThe Android Automerger0-0/+0
2012-05-21Merge "Prevent NPE with combined view and empty mailboxes" into jb-devMarc Blank1-2/+2
2012-05-21Prevent NPE with combined view and empty mailboxesMarc Blank1-2/+2
2012-05-21Merge "Fix NPE with null subject" into jb-devPaul Westbrook1-0/+3
2012-05-21Fix NPE with null subjectPaul Westbrook1-0/+3