summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/fra...cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2mr1.1-stagingcm-10.1Steve Kondik2013-02-124-26/+103
|\
| * Merge "Eliminate jank when the user deletes a character thereby removing all ...mindyp2012-12-171-1/+1
| |\
| | * Eliminate jank when the user deletes a character thereby removing all contact...mindyp2012-12-171-1/+1
| * | Merge "Fix problem where part of wrong photo shows" into jb-mr1.1-devMindy Pereira2012-12-142-2/+5
| |\ \ | | |/ | |/|
| | * Fix problem where part of wrong photo showsPaul Westbrook2012-12-142-2/+5
| * | Scroll when result of a contacts lookup appearmindyp2012-12-142-13/+80
| |/
| * Merge remote-tracking branch 'goog/jb-ub-mail' into gmailmergePaul Westbrook2012-11-191-12/+9
| |\
| | * Reduce time until first revision of a chip is drawn.mindyp2012-11-091-8/+5
| | * dont replace the text in the text field when editing a fake or generated entrymindyp2012-11-081-4/+4
| | * Make sure that we take the existng temporary contact, where available.mindyp2012-11-071-2/+3
| | * Make sure that the last "fake entry" chip is correctly committedmindyp2012-11-071-2/+3
| | * Update chips to follow new ux spec for replacementmindyp2012-11-071-30/+78
| | * Reset maxlines when the user expands textmindyp2012-11-061-2/+5
| | * Fix for panorama icon not always showing up in photo viewer.Mark Wei2012-10-252-1/+6
| | * Show old resultsPaul Westbrook2012-10-251-5/+36
| | * Restart loader on attachment cursor updatesPaul Westbrook2012-10-241-1/+5
| | * Load preview firstPaul Westbrook2012-10-121-14/+12
| | * Set the scale type for the default image iconPaul Westbrook2012-10-121-0/+1
| | * Make sure we check the most up to date text for the token offsets.mindyp2012-10-031-5/+5
| | * Add comments to the recipientedittextview replace code.mindyp2012-10-011-0/+3
| | * Fix crashes associated with new logic to replace entire address with name + a...mindyp2012-09-291-4/+1
| * | SMS text messaging omits numbers in parenthesesTom Taylor2012-11-151-1/+11
| * | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-080-0/+0
| |\ \ | |/ / |/| |
* | | merge in jb-mr1-release history after reset to jb-mr1-devcm-10.1-M1The Android Automerger2012-11-070-0/+0
|\ \ \
| | * \ Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-11-070-0/+0
| | |\ \ | | |/ / | |/| |
| * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-070-0/+0
| |\ \ \
| | | * \ am 797b22f9: Merge changes to chips from unbundled branch: update behavior to...mindyp2012-11-071-73/+86
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge changes to chips from unbundled branch: update behavior to match new ux...mindyp2012-11-071-73/+86
|/ / / /
| | * | am 06208d07: cherrypick: Reset maxlines when the user expands textmindyp2012-11-071-2/+5
| | |\ \ | |_|/ / |/| | |
* | | | cherrypick: Reset maxlines when the user expands textmindyp2012-11-061-2/+5
| | * | Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| |/|\ \ |/| |/ / | |/| |
| * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-290-0/+0
|/| | |
| * | | Show old resultsPaul Westbrook2012-10-251-5/+36
| * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-160-0/+0
| |\ \ \
| | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-140-0/+0
| | |\ \ \
| | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | | |\ \ \
* | | | | | | Fix for panorama icon not always showing up in photo viewer.Mark Wei2012-10-262-1/+6
* | | | | | | Restart loader on attachment cursor updatesPaul Westbrook2012-10-261-1/+5
* | | | | | | Show old resultsPaul Westbrook2012-10-251-5/+36
|/ / / / / /
* / / / / / SMS text messaging omits numbers in parenthesesTom Taylor2012-10-161-1/+11
|/ / / / /
| | | * | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-150-0/+0
| |_|/| | |/| | | |
| | | * | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | |/| | | |/|/ /
| | * | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-040-0/+0
| | |\ \
| | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-020-0/+0
| | | |\ \
| | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-260-0/+0
| | | | |\ \
| | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-250-0/+0
| | | | | |\ \
| | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-220-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-200-0/+0
| | | | | | | |\ \
| | | | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-190-0/+0
| | | | | | | | |\ \
| | | | | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-180-0/+0
| | | | | | | | | |\ \