summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | am 741a8156: am 1fe84a2d: (-s ours) Import translations. DO NOT MERGEEric Fischer2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | am 2bb2bd56: am 3dc96b3e: am d444e484: am 9d3bd0a0: Reconcile with jb-release...The Android Open Source Project2013-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | am 3dc96b3e: am d444e484: am 9d3bd0a0: Reconcile with jb-release nakasi-facto...The Android Open Source Project2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | am 94cf3126: (-s ours) am 47e22196: am 146ea842: (-s ours) am b775f325: (-s o...Eric Fischer2013-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | am 47e22196: am 146ea842: (-s ours) am b775f325: (-s ours) Import translation...Eric Fischer2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 12f7f484: (-s ours) am 85eee52a: am 257de1d9: (-s ours) Import translation...Eric Fischer2013-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 85eee52a: am 257de1d9: (-s ours) Import translations. DO NOT MERGEEric Fischer2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am 79cda583: (-s ours) am f2545189: am 22d63c44: (-s ours) am 8b62d386: (-s o...Eric Fischer2013-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am f2545189: am 22d63c44: (-s ours) am 8b62d386: (-s ours) Import translation...Eric Fischer2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 518ea705: (-s ours) am 3164190b: am 20a3b8c7: (-s ours) Import translation...Eric Fischer2013-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3164190b: am 20a3b8c7: (-s ours) Import translations. DO NOT MERGEEric Fischer2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3bd1ed37: (-s ours) am 8b56f108: am ce538a42: (-s ours) am ff7300c8: (-s o...Eric Fischer2013-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 8b56f108: am ce538a42: (-s ours) am ff7300c8: (-s ours) Import translation...Eric Fischer2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 25e9aded: (-s ours) am a525a0d7: am f9c54fb1: (-s ours) Import translation...Eric Fischer2013-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am a525a0d7: am f9c54fb1: (-s ours) Import translations. DO NOT MERGEEric Fischer2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 204d2ac2: (-s ours) am 0f49d40e: (-s ours) am 9922002f: (-s ours) Merge "I...Eric Fischer2013-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0f49d40e: (-s ours) am 9922002f: (-s ours) Merge "Import translations. DO ...Eric Fischer2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am fce2945d: (-s ours) am d7dcc2e7: (-s ours) am 83f4d736: (-s ours) am 56426...Eric Fischer2013-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d7dcc2e7: (-s ours) am 83f4d736: (-s ours) am 564269bf: (-s ours) Import t...Eric Fischer2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b3eb330e: am 7e3f1546: am 2e0ba2ec: Merge "Move StaggeredGridView into ex ...Alice Yang2013-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7e3f1546: am 2e0ba2ec: Merge "Move StaggeredGridView into ex from v4 suppo...Alice Yang2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 89b47ea6: am 0ac1c774: am f30ffd13: am 1896ac00: Change text on "done" to ...Mindy Pereira2013-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0ac1c774: am f30ffd13: am 1896ac00: Change text on "done" to say "return"Mindy Pereira2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 72fd8ab7: am 327b11ab: am 7e12aaa7: am dd5c5cf8: Use ALIGN_BOTTOM instead ...Mindy Pereira2013-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 327b11ab: am 7e12aaa7: am dd5c5cf8: Use ALIGN_BOTTOM instead of ALIGN_BASE...Mindy Pereira2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 919812c6: am 0719fbb2: am 32bfa893: am ab2c5069: Contact added to the "To"...Tom Taylor2013-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0719fbb2: am 32bfa893: am ab2c5069: Contact added to the "To" field of the...Tom Taylor2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e0510878: am 4ebfe2d3: am b7719c17: am 5ba77015: Merge "Don\'t autoselect ...Tom Taylor2013-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 4ebfe2d3: am b7719c17: am 5ba77015: Merge "Don\'t autoselect first item in...Tom Taylor2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 709c4e08: am a4f33daf: am 525ec743: am 593f0b4e: Fix alternate reverse loo...Mindy Pereira2013-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am a4f33daf: am 525ec743: am 593f0b4e: Fix alternate reverse lookup query.Mindy Pereira2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 45210f0c: am 81dc10b4: am 8f1f5423: am f64cbf19: Don\'t show duplicate des...Makoto Onuki2013-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 81dc10b4: am 8f1f5423: am f64cbf19: Don\'t show duplicate destinations in ...Makoto Onuki2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d07c572a: (-s ours) am 06e1da6c: am 79361f84: (-s ours) am a97c5fbb: (-s o...Eric Fischer2013-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 06e1da6c: am 79361f84: (-s ours) am a97c5fbb: (-s ours) Merge "Import tran...Eric Fischer2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f2eece87: (-s ours) am e0502615: am 680a9d72: (-s ours) Merge "Import tran...Eric Fischer2013-04-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e0502615: am 680a9d72: (-s ours) Merge "Import translations. DO NOT MERGE"Eric Fischer2013-04-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 31b46a1c: am f881a056: Prevent NPE in chipsAlice Yang2013-04-261-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f881a056: Prevent NPE in chipsAlice Yang2013-04-261-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent NPE in chipsAlice Yang2013-04-261-3/+7
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge jb-ub-mail-ur10' into masterPaul Westbrook2013-04-231-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d259fd2d: Prevent IOOB exceptionPaul Westbrook2013-04-221-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent IOOB exceptionPaul Westbrook2013-04-221-1/+2
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 38fad850: am f823cf9a: am 49f52e22: Merge "Messaging crash on selecting a ...Tom Taylor2013-04-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1aa94276: am af7d2e85: am c9daed7a: Don\'t do chip resolving in placeScott Kennedy2013-04-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f3a6b6ab: am 15f7d4b3: am a3b03772: Add liblogYing Wang2013-04-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |