summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Refactor ActionBarController and tests" into lmp-mr1-devYorke Lee2014-10-294-50/+32
|\
| * Refactor ActionBarController and testsYorke Lee2014-10-284-50/+32
* | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-10-2972-1144/+134
|\ \
| * | Import translations. DO NOT MERGEGeoff Mendal2014-10-2972-1144/+134
* | | Merge "Remove "Dial to add call" text in Dialpad" into lmp-mr1-devYorke Lee2014-10-292-33/+4
|\ \ \
| * | | Remove "Dial to add call" text in DialpadYorke Lee2014-10-282-33/+4
* | | | Merge "More test-related changes" into lmp-mr1-devYorke Lee2014-10-292-2/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | More test-related changesYorke Lee2014-10-282-2/+9
* | | | Merge "Fix various IllegalStateExceptions in Dialer" into lmp-mr1-devYorke Lee2014-10-281-7/+21
|\ \ \ \
| * | | | Fix various IllegalStateExceptions in DialerYorke Lee2014-10-281-7/+21
| | |/ / | |/| |
* | | | Merge "Create call settings intent in DialerSettingsActivity." into lmp-mr1-devAndrew Lee2014-10-282-10/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Create call settings intent in DialerSettingsActivity.Andrew Lee2014-10-272-10/+6
* | | | Merge "Delete unused strings in Dialer." into lmp-mr1-devAndrew Lee2014-10-281-89/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Delete unused strings in Dialer.Andrew Lee2014-10-271-89/+0
* | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-10-2772-3/+289
|\ \ \ \ | |_|/ / |/| | |
| * | | Import translations. DO NOT MERGEGeoff Mendal2014-10-2772-3/+289
* | | | Merge "Fix some broken Dialer tests" into lmp-mr1-devYorke Lee2014-10-274-5/+14
|\ \ \ \
| * | | | Fix some broken Dialer testsYorke Lee2014-10-254-5/+14
* | | | | Merge "Send desired size of photo to ContactPhotoManager" into lmp-mr1-devYorke Lee2014-10-271-1/+3
|\ \ \ \ \
| * | | | | Send desired size of photo to ContactPhotoManagerYorke Lee2014-10-251-1/+3
| |/ / / /
* | | | | Merge "Fix NPEs in ActionBarControllerTest" into lmp-mr1-devYorke Lee2014-10-271-3/+36
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | Fix NPEs in ActionBarControllerTestYorke Lee2014-10-251-3/+36
| |/ /
* | | Merge "Remove CallLogListItemView" into lmp-mr1-devYorke Lee2014-10-256-66/+25
|\ \ \ | |_|/ |/| |
| * | Remove CallLogListItemViewYorke Lee2014-10-246-66/+25
| |/
* / Show phone account settings for multiple sims.Andrew Lee2014-10-242-8/+32
|/
* Fix NPE in processNestedScrollJay Shrauner2014-10-241-0/+6
* Delete duplicated classBrian Attwell2014-10-2312-84/+11
* am 8c258ac5: Generalize the device IMEI display for IMEI/MEID and multi-SIM.Nancy Chen2014-10-221-50/+23
|\
| * Generalize the device IMEI display for IMEI/MEID and multi-SIM.Nancy Chen2014-10-221-50/+23
* | am 6ba0977d: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-10-220-0/+0
|\|
| * Import translations. DO NOT MERGEGeoff Mendal2014-10-221-2/+2
* | Import translations. DO NOT MERGEGeoff Mendal2014-10-221-2/+2
* | am 2c373272: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-spr...Geoff Mendal2014-10-200-0/+0
|\|
| * Merge "Import translations. DO NOT MERGE" into lmp-sprout-devGeoff Mendal2014-10-2019-111/+95
| |\
| | * Import translations. DO NOT MERGEGeoff Mendal2014-10-2019-111/+95
* | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-10-206-54/+54
|\ \ \
| * | | Import translations. DO NOT MERGEGeoff Mendal2014-10-206-54/+54
* | | | am be1f17ed: (-s ours) am 0dffb211: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-10-200-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am 0dffb211: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-10-200-0/+0
| |\ \ | | |/ | |/|
| | * Import translations. DO NOT MERGEGeoff Mendal2014-10-202-9/+11
* | | am 9d6d62d6: (-s ours) am 219d531a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
|\| |
| * | am 219d531a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| |\|
| | * Import translations. DO NOT MERGEBaligh Uddin2014-10-195-49/+47
* | | am f663fa08: Make a general call to voicemail when calling back from call log.Nancy Chen2014-10-173-13/+29
|\| |
| * | Make a general call to voicemail when calling back from call log.Nancy Chen2014-10-173-13/+29
* | | am f507886d: Merge "Enable use of phone accounts for voicemail info display."...Nancy Chen2014-10-1712-128/+159
|\| |
| * | Merge "Enable use of phone accounts for voicemail info display." into lmp-spr...Nancy Chen2014-10-1712-128/+159
| |\ \
| | * | Enable use of phone accounts for voicemail info display.Nancy Chen2014-10-1512-128/+159
* | | | Merge "Add touch feedback to action buttons" into lmp-mr1-devYorke Lee2014-10-152-31/+5
|\ \ \ \
| * | | | Add touch feedback to action buttonsYorke Lee2014-10-142-31/+5