summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Cache photo URI too in calllog (contract)"Makoto Onuki2015-03-103-0/+10
|\
| * Cache photo URI too in calllog (contract)Makoto Onuki2015-03-093-0/+10
* | Merge "Revert "Revert "Add a timeout state to frozen windows"""Craig Mautner2015-03-101-9/+17
|\ \
| * | Revert "Revert "Add a timeout state to frozen windows""Craig Mautner2015-03-101-9/+17
* | | Merge "Revert "Add a timeout state to frozen windows""Craig Mautner2015-03-101-17/+9
|\ \ \ | |/ /
| * | Revert "Add a timeout state to frozen windows"Craig Mautner2015-03-101-17/+9
* | | Merge "Handle undo in TextView fields with no cursor"James Cook2015-03-101-2/+3
|\ \ \
| * | | Handle undo in TextView fields with no cursorJames Cook2015-03-101-2/+3
* | | | Merge "Add a timeout state to frozen windows"Craig Mautner2015-03-101-9/+17
|\ \ \ \ | | |/ / | |/| |
| * | | Add a timeout state to frozen windowsCraig Mautner2015-03-051-9/+17
* | | | Merge "Revert RelativeLayout's baseline view to API 22 and below behavior"Alan Viverette2015-03-101-15/+31
|\ \ \ \
| * | | | Revert RelativeLayout's baseline view to API 22 and below behaviorAlan Viverette2015-03-091-15/+31
| | |_|/ | |/| |
* | | | Merge "resolved conflicts for merge of 7545accf to master"Elliott Hughes2015-03-102-6/+8
|\ \ \ \
| * \ \ \ resolved conflicts for merge of 7545accf to masterElliott Hughes2015-03-102-6/+8
| |\ \ \ \
| | * \ \ \ am 6291bedd: am 63d43949: Merge "Use the icu:: namespace for icu4c API."Elliott Hughes2015-03-092-5/+7
| | |\ \ \ \
| | | * \ \ \ am 63d43949: Merge "Use the icu:: namespace for icu4c API."Elliott Hughes2015-03-092-5/+7
| | | |\ \ \ \
| | | | * \ \ \ Merge "Use the icu:: namespace for icu4c API."Elliott Hughes2015-03-092-5/+7
| | | | |\ \ \ \
| | | | | * | | | Use the icu:: namespace for icu4c API.Elliott Hughes2015-03-072-5/+7
* | | | | | | | | Merge "Glop based composeLayerRegion/Rect"Chris Craik2015-03-109-48/+112
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Glop based composeLayerRegion/RectChris Craik2015-03-099-48/+112
* | | | | | | | | | Merge "Rename and simplify DisplayList Canvas classes"Chris Craik2015-03-1010-136/+103
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Rename and simplify DisplayList Canvas classesChris Craik2015-03-0910-136/+103
* | | | | | | | | | am b219eac8: am a05634ff: am 408800c3: am ea9308cf: am a9639fe6: am 2fcc438f:...Luan Nguyen2015-03-104-0/+9
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | am a05634ff: am 408800c3: am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778:...Luan Nguyen2015-03-094-0/+9
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am 408800c3: am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs:...Luan Nguyen2015-03-094-0/+9
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new part...Luan Nguyen2015-03-094-0/+9
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear ...Luan Nguyen2015-03-094-0/+9
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" i...Luan Nguyen2015-03-094-0/+9
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docsLuan Nguyen2015-03-094-0/+9
| | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ Merge "docs: Add new partners to Wear index page" into lmp-docsLuan Nguyen2015-03-094-0/+9
| | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | docs: Add new partners to Wear index pageLuan Nguyen2015-03-034-0/+9
* | | | | | | | | | | | | | | | | am c90aa638: (-s ours) am 535bf0f8: (-s ours) am d7852b66: (-s ours) Import t...Geoff Mendal2015-03-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 535bf0f8: (-s ours) am d7852b66: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am d7852b66: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-03-090-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-092-8/+8
* | | | | | | | | | | | | | | | | am 89d0c0fb: am bcea1fcd: am f1eab6f5: am 39d47c7c: am a2d342e3: am beed9332:...Eric Gilmore2015-03-105-1300/+209
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am bcea1fcd: am f1eab6f5: am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf:...Eric Gilmore2015-03-095-1300/+209
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am f1eab6f5: am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Rewor...Eric Gilmore2015-03-095-1300/+209
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofenci...Eric Gilmore2015-03-065-1300/+209
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training t...Eric Gilmore2015-03-065-1300/+209
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / /
| | | | | * | | | | | | | | | | | am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and...Eric Gilmore2015-03-065-1300/+209
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / /
| | | | | | * | | | | | | | | | | am 0bceaacf: Merge "Reworking geofencing training to new API and sample." int...Eric Gilmore2015-03-065-1300/+209
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / /
| | | | | | | * | | | | | | | | | Merge "Reworking geofencing training to new API and sample." into lmp-docsEric Gilmore2015-03-065-1300/+209
| | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | | Reworking geofencing training to new API and sample.Eric Gilmore2015-03-065-1300/+209
* | | | | | | | | | | | | | | | | | am f507759e: am e442d914: am ad97ca81: am 4c0b2345: am 8f9ae232: am 36d008c5:...Glenn Kasten2015-03-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am e442d914: am ad97ca81: am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f:...Glenn Kasten2015-03-092-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am ad97ca81: am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typosGlenn Kasten2015-03-092-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typosGlenn Kasten2015-03-062-5/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typosGlenn Kasten2015-03-062-5/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / /
| | | | | * | | | | | | | | | | | am 36d008c5: am 5afdc97f: Fix USB typosGlenn Kasten2015-03-062-5/+5
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / /