summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-03-25Don't allow cachedFile Attachments if the content Uri is pointing to EmailPro...android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-5.1.1_r38lollipop-mr1-releaselollipop-mr1-cts-releaseSam Lee
2016-02-26Don't allow file attachment from file:///data.android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r10android-5.1.1_r37Régis Décamps
2014-11-08merge in lmp-mr1-release history after reset to c1b5d359dd97f9e0471694a1b3136...android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r2android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r4android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-fi-releaseThe Android Automerger
2014-11-06merge in lmp-mr1-release history after reset to c1b5d359dd97f9e0471694a1b3136...The Android Automerger
2014-11-05merge in lmp-mr1-release history after reset to c1b5d359dd97f9e0471694a1b3136...The Android Automerger
2014-11-04merge in lmp-mr1-release history after reset to c1b5d359dd97f9e0471694a1b3136...The Android Automerger
2014-11-03am e757dd81: (-s ours) Import translations. DO NOT MERGEandroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-devGeoff Mendal
2014-11-03Import translations. DO NOT MERGEGeoff Mendal
2014-11-03Import translations. DO NOT MERGEGeoff Mendal
2014-11-03merge in lmp-mr1-release history after reset to 9b555157a8ff9c5e4fb47987b18a7...The Android Automerger
2014-11-02am 1b19a301: resolved conflicts for merge of 41b2d050 to lmp-sprout-devPaul Westbrook
2014-11-02resolved conflicts for merge of 41b2d050 to lmp-sprout-devPaul Westbrook
2014-11-02am b5bee6f8: (-s ours) am 2d450dfb: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
2014-11-02am 77712377: (-s ours) am 3918a915: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
2014-11-02am aab07018: (-s ours) am 96813454: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
2014-11-02am 22ef937e: am 43346303: Use borderless ripple for searchJin Cao
2014-11-02am 9d96c776: am 20c3e580: Merge "Combine conv and misc panes into one frame a...Jin Cao
2014-11-02am fe10eeb0: am 366947ac: Merge "Save the focused conversation via id instead...Jin Cao
2014-11-02am 25d70e7d: am 1caa0f28: Merge "Navigate up if up is pressed for nested fold...Jin Cao
2014-11-02am ef36f1c5: am 9f3acef8: Set maxWidth for tablet snackbar action text.Andrew Sapperstein
2014-11-02am 90ec8e01: am 17553ce2: Merge "Prevent rare NPE" into ub-gmail-ur14-devTony Mantler
2014-11-02am 8a819016: am bd16ec75: Merge "Programmatically set selected state to corre...Andy Huang
2014-11-02am f9c41264: am 547cc85c: restore peeking stateAndy Huang
2014-11-02am bb9554d1: am 80c6dc4c: only auto-close the drawer when selecting from the ...Andy Huang
2014-11-02am bf0e30d4: am 7a2a78fa: Merge "Don\'t include the default footer when there...Jin Cao
2014-11-02am 793f066c: am f91f88ef: Use guava Objects.equalJin Cao
2014-11-02am a4c7e507: am 95298ff5: Merge "Analytics: Remove dimension #10 (account typ...Régis Décamps
2014-11-02am 9cfe96d9: am c10a95be: fix occasional blank CV panes on activity startupAndy Huang
2014-11-02am c8a31368: am 88feee01: Merge "Revert "Force Show Vector Drawables (Unified...Rohan Shah
2014-11-02am 1a6c39d4: am 6ac079b4: Cleanup of drawer dragJin Cao
2014-11-02am 00c22351: am 0c07334f: Merge "Enable hardware acceleration for drawer drag...Jin Cao
2014-11-02am 02bc1163: am f9b88e40: Merge "treat taps in CV in peek mode as marking the...Andy Huang
2014-11-02am 8d9328fe: am 1a120be0: Merge "fix crash when rotating an Ad on tablet" int...Andy Huang
2014-11-02am bc609061: am 9cd03410: Merge "Force Show Vector Drawables (UnifiedEmail)" ...Rohan Shah
2014-11-02am 652b8c69: am 3c8e398e: Merge "Peek mode for 2-pane landscape" into ub-gmai...Andy Huang
2014-11-02am 53b835c1: am 113cf638: Merge "Reset search button visibility on account ch...Jin Cao
2014-11-02am 6be23e3d: am 8291a8a6: Enable third-party cookies. b/16014255Andrew Sapperstein
2014-11-02am ec8fc2fa: am 96062c36: Add white backgrounds to CV overlays.Andrew Sapperstein
2014-11-02am 927029c5: am 3983afc4: Merge "Hardware accelerate drawer cross-fade" into ...Jin Cao
2014-11-02am ffd85257: am 76193af1: Merge "Allow dragging the drawer close from CV" int...Jin Cao
2014-11-02am df489aa2: am bbe52eb9: Merge "Use 16sp Roboto Regular for pre-L in drawer....Andrew Sapperstein
2014-11-02am e4af65d7: am 63738811: Fix NPE when folderUri is null.Milos Stankovic
2014-11-02am cac57f7e: am 08746f5b: Merge "Fix NoClassDefFound in tests with proguard-t...Régis Décamps
2014-11-02am f8379db3: am de56df00: Fix NPE when parameter is null in NotificationActio...Régis Décamps
2014-11-02am 1db21327: (-s ours) am 4c2d0c0f: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
2014-11-02am 655a0488: am 612eb328: Allow to resend all notificationsRégis Décamps
2014-11-02am 379898e7: am fbb0c7f6: Cross-fade the drawer on toggle/dragJin Cao
2014-11-02am 3fb1c00d: am 6d136a60: DO NOT MERGE Revert "back to dogfood"Andy Huang
2014-11-02am a617809d: am 74fcd240: Merge "Don\'t allow for drag during mode change" in...Jin Cao
2014-11-02am 86f3ea4f: am 4781f334: Add current focus to MailActivity toStringJin Cao