summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | resolved conflicts for merge of ffc0111f to masterJin Cao2014-12-153-157/+97
|\| | |
| * | | Clean up chipsJin Cao2014-12-153-155/+87
* | | | am 654c967e: Prevent infinite posting of RunnablesScott Kennedy2014-12-121-6/+24
|\| | |
| * | | Prevent infinite posting of RunnablesScott Kennedy2014-12-121-6/+24
* | | | am cb11fced: Adding customized chip color supportKaikai Wang2014-12-092-9/+33
|\| | |
| * | | Adding customized chip color supportKaikai Wang2014-12-092-9/+33
* | | | am 494bec8d: Override setDropDownAnchor in RecipientEditTextView to update it...Kevin Lin2014-12-021-0/+8
|\| | |
| * | | Override setDropDownAnchor in RecipientEditTextView to update its cached anch...Kevin Lin2014-12-021-0/+8
* | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-171-1/+1
* | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-121-1/+1
* | | | am 18eefa52: Merge "Auto dismiss popups when touches happen outside the popup...Jin Cao2014-11-101-2/+13
|\| | |
| * | | Merge "Auto dismiss popups when touches happen outside the popup window" into...Jin Cao2014-11-101-2/+13
| |\ \ \
| | * | | Auto dismiss popups when touches happen outside the popup windowJin Cao2014-11-101-2/+13
* | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-101-1/+1
* | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-11-071-1/+1
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-11-071-1/+1
* | | | | | am 662ccbe4: Merge "Make clearSelectedChip public" into ub-chips-cranbrookJin Cao2014-11-071-1/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Make clearSelectedChip public" into ub-chips-cranbrookJin Cao2014-11-071-1/+5
| |\ \ \ \ \
| | * | | | | Make clearSelectedChip publicJin Cao2014-11-061-1/+5
| | | |/ / / | | |/| | |
* | | | | | am 732fe3e7: Take vertical offset into account for dropdown heightJin Cao2014-11-061-1/+2
|\| | | | | | |_|/ / / |/| | | |
| * | | | Take vertical offset into account for dropdown heightJin Cao2014-11-061-1/+2
| |/ / /
* | | | am d525772a: Change alternates dropdown to use minHeightJin Cao2014-11-051-1/+2
|\| | |
| * | | Change alternates dropdown to use minHeightJin Cao2014-11-051-1/+2
* | | | am 191db274: (-s ours) am 43f14897: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | am 43f14897: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
| |\ \ \
| | * | | Import translations. DO NOT MERGEBaligh Uddin2014-10-3073-74/+74
* | | | | am bae3fba5: Switching to LOLLIPOP version code after L\'s SDK changeKaikai Wang2014-10-290-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Switching to LOLLIPOP version code after L's SDK changeKaikai Wang2014-10-291-1/+1
* | | | | am 2d06b856: Use instead of for number formattingJin Cao2014-10-2281-81/+81
|\| | | |
| * | | | Use $d instead of $s for number formattingJin Cao2014-10-2281-81/+81
* | | | | am 211ddc7f: (-s ours) am a38f80f1: (-s ours) am 966b3500: (-s ours) Import t...Baligh Uddin2014-10-220-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am a38f80f1: (-s ours) am 966b3500: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-210-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am 966b3500: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| | |\ \ \
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-201-1/+1
* | | | | | am 8356b818: (-s ours) am 43e9ff21: (-s ours) am 2b498330: (-s ours) am 19fac...Baligh Uddin2014-10-190-0/+0
|\| | | | |
| * | | | | am 43e9ff21: (-s ours) am 2b498330: (-s ours) am 19fac962: (-s ours) am 966b3...Baligh Uddin2014-10-190-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | am 2b498330: (-s ours) am 19fac962: (-s ours) am 966b3500: (-s ours) Import t...Baligh Uddin2014-10-190-0/+0
| | |\ \ \
| | | * | | am 19fac962: (-s ours) am 966b3500: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| | |/| | |
| | | * | | am 966b3500: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| | |/| | | | | | |/ /
| | | * / Import translations. DO NOT MERGEstaging/cm-12.0-cafBaligh Uddin2014-10-192-2/+2
| | |/ /
* | | | fix buildNick Kralevich2014-10-181-1/+1
* | | | am 0437e862: Close directoryCursor. b/17949234Andrew Sapperstein2014-10-181-4/+11
|\ \ \ \ | | |_|/ | |/| |
| * | | Close directoryCursor. b/17949234Andrew Sapperstein2014-10-181-4/+11
* | | | am 50fcac9f: (-s ours) am e7ebf99c: (-s ours) Add an <application> tag to the...Scott Kennedy2014-10-170-0/+0
|\| | |
| * | | am e7ebf99c: (-s ours) Add an <application> tag to the manifest DO NOT MERGEScott Kennedy2014-10-170-0/+0
| |\ \ \
| | * | | Add an <application> tag to the manifest DO NOT MERGEScott Kennedy2014-10-171-1/+3
* | | | | am 0ecd6946: Add an <application> tag to the manifestScott Kennedy2014-10-141-1/+3
|\| | | |
| * | | | Add an <application> tag to the manifestScott Kennedy2014-10-141-1/+3
* | | | | am f6ddb754: Don\'t rely on action bar heightJin Cao2014-10-131-22/+2
|\| | | |
| * | | | Don't rely on action bar heightJin Cao2014-10-131-22/+2