summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2013-10-0423-5/+515
* Remove some unused resources and importsScott Kennedy2013-08-227-20/+0
* Add directory photo supportJay Shrauner2013-08-091-14/+46
* Make Chips work on API 11+Scott Kennedy2013-08-024-5/+58
* Remove an unnecessary null checkScott Kennedy2013-08-011-4/+0
* Don't bother storing a null value in the cacheScott Kennedy2013-07-291-2/+4
* Fix some javadoc bugs.Andrew Sapperstein2013-07-011-5/+4
* Prepare to remove a null checkScott Kennedy2013-06-191-0/+1
* Fix a NPEScott Kennedy2013-06-071-27/+33
* am f881a056: Prevent NPE in chipsAlice Yang2013-04-261-3/+7
|\
| * Prevent NPE in chipsAlice Yang2013-04-261-3/+7
* | am d259fd2d: Prevent IOOB exceptionPaul Westbrook2013-04-221-1/+2
|\|
| * Prevent IOOB exceptionPaul Westbrook2013-04-221-1/+2
* | am f823cf9a: am 49f52e22: Merge "Messaging crash on selecting a contact from ...Tom Taylor2013-04-151-0/+3
|\|
| * 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 af7d2e85: am c9daed7a: Don\'t do chip resolving in placeScott Kennedy2013-04-151-11/+11
|\| | |
| * | | 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 15f7d4b3: am a3b03772: Add liblogYing Wang2013-04-151-0/+1
|\| |
| * | am a3b03772: Add liblogYing Wang2013-04-101-0/+1
| |\|
| | * Add liblogYing Wang2013-04-091-0/+1
* | | am 7eff765c: Merge remote-tracking branch \'goog/jb-mr2-dev\' into ur9Alice Yang2013-04-158-57/+137
|\| |
| * | Merge remote-tracking branch 'goog/jb-mr2-dev' into ur9Alice Yang2013-04-098-57/+137
| |\|
| | * am da491f04: Prevent a potential ANRScott Kennedy2013-04-051-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-1315-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-081-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-041-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 211ae635: Reduce chip jankScott Kennedy2013-02-284-67/+112
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \