summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 872a5a1a: am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b:...Deepanshu Gupta2014-05-131-0/+1
|\
| * am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a:...Deepanshu Gupta2014-05-131-0/+1
| |\
| | * am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96:...Deepanshu Gupta2014-05-131-0/+1
| | |\
| | | * am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9:...Deepanshu Gupta2014-05-131-0/+1
| | | |\
| | | | * am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00:...Deepanshu Gupta2014-05-131-0/+1
| | | | |\
| | | | | * am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved con...Deepanshu Gupta2014-05-131-0/+1
| | | | | |\
| | | | | | * am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for me...Deepanshu Gupta2014-05-131-0/+1
| | | | | | |\
| | | | | | | * am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e6...Deepanshu Gupta2014-05-131-0/+1
| | | | | | | |\
| | | | | | | | * am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1....Deepanshu Gupta2014-05-131-0/+1
| | | | | | | | |\
| | | | | | | | | * am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-devDeepanshu Gupta2014-05-131-0/+1
| | | | | | | | | |\
| | | | | | | | | | * resolved conflicts for merge of 9c00e673 to jb-mr1.1-devDeepanshu Gupta2014-05-131-0/+1
| | | | | | | | | | |\
| | | | | | | | | | | * am 2fb139e0: resolved conflicts for merge of 9f2f5e77 to jb-mr1-devDeepanshu Gupta2014-05-132-0/+63
| | | | | | | | | | | |\
| | | | | | | | | | | | * resolved conflicts for merge of 9f2f5e77 to jb-mr1-devDeepanshu Gupta2014-05-122-0/+63
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * am 2d82586b: Fix CalendarView to show the right labels. [DO NOT MERGE]Deepanshu Gupta2014-05-132-0/+62
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * Fix CalendarView to show the right labels. [DO NOT MERGE]Deepanshu Gupta2014-05-052-0/+62
* | | | | | | | | | | | | | | am 7ce3b5ef: am 04c9d193: am 9d7cf825: Merge "docs: Added release notes for B...Ricardo Cervera2014-05-131-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 04c9d193: am 9d7cf825: Merge "docs: Added release notes for Build Tools 19...Ricardo Cervera2014-05-131-0/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am 9d7cf825: Merge "docs: Added release notes for Build Tools 19.1.0" into kl...Ricardo Cervera2014-05-131-0/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "docs: Added release notes for Build Tools 19.1.0" into klp-docsRicardo Cervera2014-05-131-0/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | docs: Added release notes for Build Tools 19.1.0Ricardo Cervera2014-05-131-0/+20
* | | | | | | | | | | | | | | | | am 6c81d1e7: am 987953a2: am 3271adea: am 6b0c4276: am dff29f73: am 5974d229:...Deepanshu Gupta2014-05-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 987953a2: am 3271adea: am 6b0c4276: am dff29f73: am 5974d229: am 0cbfde12:...Deepanshu Gupta2014-05-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am 3271adea: am 6b0c4276: am dff29f73: am 5974d229: am 0cbfde12: am 40b54563:...Deepanshu Gupta2014-05-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | am 6b0c4276: am dff29f73: am 5974d229: am 0cbfde12: am 40b54563: am 07f8da65:...Deepanshu Gupta2014-05-130-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | am dff29f73: am 5974d229: am 0cbfde12: am 40b54563: am 07f8da65: am 888461c8:...Deepanshu Gupta2014-05-130-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / / | | | | | |/| | | | | | | | | | |
| | | | | * | | | | | | | | | | | am 5974d229: am 0cbfde12: am 40b54563: am 07f8da65: am 888461c8: resolved con...Deepanshu Gupta2014-05-130-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|/ / / / / / / / / | | | | | | |/| | | | | | | | | |
| | | | | | * | | | | | | | | | | am 0cbfde12: am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for me...Deepanshu Gupta2014-05-130-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|/ / / / / / / / | | | | | | | |/| | | | | | | | |
| | | | | | | * | | | | | | | | | am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ec...Deepanshu Gupta2014-05-130-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | |_|/ / / / / / / | | | | | | | | |/| | | | | | | |
| | | | | | | | * | | | | | | | | am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1....Deepanshu Gupta2014-05-130-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | |_|/ / / / / / | | | | | | | | | |/| | | | | | |
| | | | | | | | | * | | | | | | | am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-devDeepanshu Gupta2014-05-130-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | |_|/ / / / / | | | | | | | | | | |/| | | | | |
| | | | | | | | | | * | | | | | | resolved conflicts for merge of 1103ece2 to jb-mr1.1-devDeepanshu Gupta2014-05-120-0/+0
| | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | |_|/ / / / | | | | | | | | | | | |/| | | | |
| | | | | | | | | | | * | | | | | am f20c9c66: am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE]Deepanshu Gupta2014-05-131-6/+15
| | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | |_|/ / / | | | | | | | | | | | | |/| | | |
| | | | | | | | | | | | * | | | | am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE]Deepanshu Gupta2014-05-131-6/+15
| | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | |_|/ / | | | | | | | | | | | | | |/| | |
| | | | | | | | | | | | | * | | | am 64dc0380: Fix layoutlib [DO NOT MERGE]Deepanshu Gupta2014-05-131-6/+15
| | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | |_|/ | | | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | | * | | Fix layoutlib [DO NOT MERGE]Deepanshu Gupta2014-05-051-6/+15
* | | | | | | | | | | | | | | | | am a8e18c81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-mod...Baligh Uddin2014-05-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-modular-devBaligh Uddin2014-05-132-51/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-05-122-51/+51
* | | | | | | | | | | | | | | | | | am d6a8e083: am 11c87237: am 663a1c74: am 9e0593fb: (-s ours) am 513bf25d: am...Deepanshu Gupta2014-05-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 11c87237: am 663a1c74: am 9e0593fb: (-s ours) am 513bf25d: am 5b42e1ae: am...Deepanshu Gupta2014-05-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am 663a1c74: am 9e0593fb: (-s ours) am 513bf25d: am 5b42e1ae: am b5b4d6eb: (-...Deepanshu Gupta2014-05-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | am 9e0593fb: (-s ours) am 513bf25d: am 5b42e1ae: am b5b4d6eb: (-s ours) am a7...Deepanshu Gupta2014-05-130-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | am 513bf25d: am 5b42e1ae: am b5b4d6eb: (-s ours) am a7c0d02a: am 0e50f1c2: am...Deepanshu Gupta2014-05-130-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / | | | | | |/| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | am 5b42e1ae: am b5b4d6eb: (-s ours) am a7c0d02a: am 0e50f1c2: am 5e8b02db: am...Deepanshu Gupta2014-05-130-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / | | | | | | |/| | | | | | | | | | |
| | | | | | * | | | | | | | | | | | am b5b4d6eb: (-s ours) am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am...Deepanshu Gupta2014-05-130-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / | | | | | | | |/| | | | | | | | | |
| | | | | | | * | | | | | | | | | | am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d:...Deepanshu Gupta2014-05-130-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / | | | | | | | | |/| | | | | | | | |
| | | | | | | | * | | | | | | | | | am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd:...Deepanshu Gupta2014-05-130-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |/ / / / / / / / | | | | | | | | | |/| | | | | | | |
| | | | | | | | | * | | | | | | | | am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCas...Deepanshu Gupta2014-05-130-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | |/ / / / / / / | | | | | | | | | | |/| | | | | | |
| | | | | | | | | | * | | | | | | | am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException wh...Deepanshu Gupta2014-05-130-0/+0
| | | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | |/ / / / / / | | | | | | | | | | | |/| | | | | |
| | | | | | | | | | | * | | | | | | am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ...Deepanshu Gupta2014-05-134-129/+156
| | | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | |/ / / / / | | | | | | | | | | | | |/| | | | |