summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | * 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
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to a7675372b061c8fb56d38ce0c418e...The Android Automerger2014-09-220-0/+0
| | | | | |/|
| | | | | | * merge in lmp-mr1-release history after reset to a7675372b061c8fb56d38ce0c418e...The Android Automerger2014-09-220-0/+0
| | | | | |/|
| * | | | | | am e757dd81: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-030-0/+0
| |\ \ \ \ \ \
| | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-0372-3962/+4387
| * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-0372-3962/+4387
| | |/ / / / / | |/| | | | |
| * | | | | | am 1b19a301: resolved conflicts for merge of 41b2d050 to lmp-sprout-devPaul Westbrook2014-11-0212-95/+69
| |\| | | | |
| | * | | | | resolved conflicts for merge of 41b2d050 to lmp-sprout-devPaul Westbrook2014-11-0212-95/+69
| | |\ \ \ \ \
| | | * \ \ \ \ Merge AOSP ur14 to lmp-devPaul Westbrook2014-10-280-0/+0
| | | |\ \ \ \ \
| * | | | | | | | am b5bee6f8: (-s ours) am 2d450dfb: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-020-0/+0
| |\| | | | | | |
| | * | | | | | | am 2d450dfb: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-020-0/+0
| | |\| | | | | |
| | | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-275-6/+6
| * | | | | | | | am 77712377: (-s ours) am 3918a915: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-020-0/+0
| |\| | | | | | |
| | * | | | | | | am 3918a915: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-020-0/+0
| | |\| | | | | |
| | | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-202-4/+4
| * | | | | | | | am aab07018: (-s ours) am 96813454: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-11-020-0/+0
| |\| | | | | | |
| | * | | | | | | am 96813454: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-11-020-0/+0
| | |\| | | | | |
| | | * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-195-142/+142
| * | | | | | | | am 22ef937e: am 43346303: Use borderless ripple for searchJin Cao2014-11-022-3/+3
| |\| | | | | | |
| | * | | | | | | am 43346303: Use borderless ripple for searchJin Cao2014-11-022-3/+3
| | |\| | | | | |
| | | * | | | | | Use borderless ripple for searchJin Cao2014-10-182-3/+3
| * | | | | | | | am 9d96c776: am 20c3e580: Merge "Combine conv and misc panes into one frame a...Jin Cao2014-11-022-42/+43
| |\| | | | | | |
| | * | | | | | | am 20c3e580: Merge "Combine conv and misc panes into one frame and animate th...Jin Cao2014-11-022-42/+43
| | |\| | | | | |
| | | * | | | | | Merge "Combine conv and misc panes into one frame and animate that instead" i...Jin Cao2014-10-182-42/+43
| | | |\ \ \ \ \ \
| | | | * | | | | | Combine conv and misc panes into one frame and animate that insteadJin Cao2014-10-172-42/+43
| * | | | | | | | | am fe10eeb0: am 366947ac: Merge "Save the focused conversation via id instead...Jin Cao2014-11-026-53/+72
| |\| | | | | | | |
| | * | | | | | | | am 366947ac: Merge "Save the focused conversation via id instead of position"...Jin Cao2014-11-026-53/+72
| | |\| | | | | | |
| | | * | | | | | | Merge "Save the focused conversation via id instead of position" into ub-gmai...Jin Cao2014-10-186-53/+72
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Save the focused conversation via id instead of positionJin Cao2014-10-176-53/+72
| | | | |/ / / / / /
| * | | | | | | | | am 25d70e7d: am 1caa0f28: Merge "Navigate up if up is pressed for nested fold...Jin Cao2014-11-021-1/+8
| |\| | | | | | | |
| | * | | | | | | | am 1caa0f28: Merge "Navigate up if up is pressed for nested folders" into ub-...Jin Cao2014-11-021-1/+8
| | |\| | | | | | |
| | | * | | | | | | Merge "Navigate up if up is pressed for nested folders" into ub-gmail-ur14-devJin Cao2014-10-171-1/+8
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Navigate up if up is pressed for nested foldersJin Cao2014-10-171-1/+8
| | | | |/ / / / / /
| * | | | | | | | | am ef36f1c5: am 9f3acef8: Set maxWidth for tablet snackbar action text.Andrew Sapperstein2014-11-022-0/+3
| |\| | | | | | | |
| | * | | | | | | | am 9f3acef8: Set maxWidth for tablet snackbar action text.Andrew Sapperstein2014-11-022-0/+3
| | |\| | | | | | |
| | | * | | | | | | Set maxWidth for tablet snackbar action text.Andrew Sapperstein2014-10-172-0/+3
| | | |/ / / / / /
| * | | | | | | | am 90ec8e01: am 17553ce2: Merge "Prevent rare NPE" into ub-gmail-ur14-devTony Mantler2014-11-022-3/+5
| |\| | | | | | |
| | * | | | | | | am 17553ce2: Merge "Prevent rare NPE" into ub-gmail-ur14-devTony Mantler2014-11-022-3/+5
| | |\| | | | | |
| | | * | | | | | Merge "Prevent rare NPE" into ub-gmail-ur14-devTony Mantler2014-10-172-3/+5
| | | |\ \ \ \ \ \
| | | | * | | | | | Prevent rare NPETony Mantler2014-10-162-3/+5
| * | | | | | | | | am 8a819016: am bd16ec75: Merge "Programmatically set selected state to corre...Andy Huang2014-11-026-17/+118
| |\| | | | | | | |
| | * | | | | | | | am bd16ec75: Merge "Programmatically set selected state to correspond to peek...Andy Huang2014-11-026-17/+118
| | |\| | | | | | |
| | | * | | | | | | Merge "Programmatically set selected state to correspond to peeking conv" int...Andy Huang2014-10-176-17/+118
| | | |\ \ \ \ \ \ \