summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Correctly match against normalized phone numbers.cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2Danny Baumann2013-09-044-39/+59
* Merge tag 'android-4.3_r2.1' into cm-10.2Ricardo Cerqueira2013-07-24169-6484/+1411
|\
| * Prevent NPE in chipsAlice Yang2013-04-261-3/+7
| * Prevent IOOB exceptionPaul Westbrook2013-04-221-1/+2
| * am 49f52e22: Merge "Messaging crash on selecting a contact from the auto comp...Tom Taylor2013-04-151-0/+3
| |\
| | * Merge "Messaging crash on selecting a contact from the auto complete list in ...Tom Taylor2013-04-151-0/+3
| | |\
| | | * Messaging crash on selecting a contact from the auto complete list in landsca...Tom Taylor2013-04-101-0/+3
| * | | am c9daed7a: Don\'t do chip resolving in placeScott Kennedy2013-04-111-11/+11
| |\ \ \ | | |/ /
| | * | Don't do chip resolving in placeScott Kennedy2013-04-111-11/+11
| | |/
| * | am a3b03772: Add liblogYing Wang2013-04-101-0/+1
| |\ \ | | |/
| | * Add liblogYing Wang2013-04-101-0/+1
| * | Merge remote-tracking branch 'goog/jb-mr2-dev' into ur9Alice Yang2013-04-098-57/+137
| |\ \ | | |/
| | * am da491f04: Prevent a potential ANRScott Kennedy2013-04-061-30/+39
| | |\
| | * | StringIndexOutOfBoundsException in Chips during monkey runTom Taylor2013-03-261-1/+1
| | * | am f5ecf6ad: Add unit test for creating fake phone entriesScott Kennedy2013-03-222-2/+38
| | |\ \
| | * \ \ am f9171bb3: Cherry-pick: Area code gets eaten in ChipsTom Taylor2013-03-220-0/+0
| | |\ \ \
| | * | | | Area code gets eaten in ChipsTom Taylor2013-03-212-1/+11
| | * | | | am 52dba50b: ArrayIndexOutOfBoundsException in RecipientEntry.constructFakeEntryTom Taylor2013-03-190-0/+0
| | |\ \ \ \
| | * | | | | ArrayIndexOutOfBoundsException in RecipientEntry.constructFakeEntryTom Taylor2013-03-191-1/+1
| | * | | | | am 8b7e1e57: Cherry-pick Fix a Dead Loop issue in RecipientEditTextViewjli119X2013-03-140-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ am e46cb66d: Always close this cursorScott Kennedy2013-03-141-4/+11
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ resolved conflicts for merge of 35d3af70 to jb-mr2-devScott Kennedy2013-03-141-2/+2
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ am 8682651d: Merge "Fix a Dead Loop issue in RecipientEditTextView"Scott Kennedy2013-03-141-2/+2
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge "Fix a Dead Loop issue in RecipientEditTextView"Scott Kennedy2013-03-141-2/+2
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Fix a Dead Loop issue in RecipientEditTextViewjli119X2013-01-081-2/+2
| | * | | | | | | | | | Merge remote-tracking branch 'goog/jb-ub-mail-ur9' into mergeAlice Yang2013-03-1415-465/+631
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am e53461a8: am 129a87f9: am 6b0409db: (-s ours) am 92be9d34: (-s ours) Recon...Jean-Baptiste Queru2013-03-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | am 129a87f9: am 6b0409db: (-s ours) am 92be9d34: (-s ours) Reconcile with jb-...Jean-Baptiste Queru2013-03-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | am 6b0409db: (-s ours) am 92be9d34: (-s ours) Reconcile with jb-mr1-release -...Jean-Baptiste Queru2013-03-110-0/+0
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ am 92be9d34: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | | * | | | | | | | | Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Ensure appended emails have a comma separatorScott Kennedy2013-03-091-12/+10
| | * | | | | | | | | | | | | am 5863e75e: Ensure we chipify the original textScott Kennedy2013-03-051-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 0159508d: Merge "Fix some jank" into jb-ub-mail-ur8Scott Kennedy2013-03-051-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 48ad5213: Fix NPE.Alice Yang2013-03-051-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of c4d46df7 to jb-mr2-devAlice Yang2013-03-051-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 211ae635: Reduce chip jankScott Kennedy2013-02-284-67/+112
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8c386766: Use the best contact result for chipsScott Kennedy2013-02-261-2/+68
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 'goog/jb-ub-mail-ur8' into masterAlice Yang2013-02-213-5/+59
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'goog/jb-ub-mail-ur8' into masterPaul Westbrook2013-02-15151-6229/+286
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-041-1/+1
| | * | | | | | | | | | | | | | | | | | | | | Repeatable ANR when pasting text into the recipient fieldTom Taylor2013-01-151-0/+3
| | * | | | | | | | | | | | | | | | | | | | | Merge "Revert "Move location provider lib to frameworks/ex - 2""Laurent Tu2012-12-178-637/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | Revert "Move location provider lib to frameworks/ex - 2"Laurent Tu2012-12-118-637/+0
| | * | | | | | | | | | | | | | | | | | | | | | am 9f662b7d: am a918fec5: Merge "Eliminate jank when the user deletes a chara...mindyp2012-12-171-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | am a918fec5: Merge "Eliminate jank when the user deletes a character thereby ...mindyp2012-12-171-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | am e9c8a53c: am 7d7b83bc: Merge "Fix problem where part of wrong photo shows"...Mindy Pereira2012-12-152-2/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | am 7d7b83bc: Merge "Fix problem where part of wrong photo shows" into jb-mr1....Mindy Pereira2012-12-152-2/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'f54b3505' into manualmergemindyp2012-12-152-17/+71
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | / / / / / / / / / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | am 3665fb7a: Scroll when result of a contacts lookup appearmindyp2012-12-152-13/+80
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \