Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Cache photo URI too in calllog (contract)" | Makoto Onuki | 2015-03-10 | 3 | -0/+10 |
|\ | |||||
| * | Cache photo URI too in calllog (contract) | Makoto Onuki | 2015-03-09 | 3 | -0/+10 |
* | | Merge "Revert "Revert "Add a timeout state to frozen windows""" | Craig Mautner | 2015-03-10 | 1 | -9/+17 |
|\ \ | |||||
| * | | Revert "Revert "Add a timeout state to frozen windows"" | Craig Mautner | 2015-03-10 | 1 | -9/+17 |
* | | | Merge "Revert "Add a timeout state to frozen windows"" | Craig Mautner | 2015-03-10 | 1 | -17/+9 |
|\ \ \ | |/ / | |||||
| * | | Revert "Add a timeout state to frozen windows" | Craig Mautner | 2015-03-10 | 1 | -17/+9 |
* | | | Merge "Handle undo in TextView fields with no cursor" | James Cook | 2015-03-10 | 1 | -2/+3 |
|\ \ \ | |||||
| * | | | Handle undo in TextView fields with no cursor | James Cook | 2015-03-10 | 1 | -2/+3 |
* | | | | Merge "Add a timeout state to frozen windows" | Craig Mautner | 2015-03-10 | 1 | -9/+17 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Add a timeout state to frozen windows | Craig Mautner | 2015-03-05 | 1 | -9/+17 |
* | | | | Merge "Revert RelativeLayout's baseline view to API 22 and below behavior" | Alan Viverette | 2015-03-10 | 1 | -15/+31 |
|\ \ \ \ | |||||
| * | | | | Revert RelativeLayout's baseline view to API 22 and below behavior | Alan Viverette | 2015-03-09 | 1 | -15/+31 |
| | |_|/ | |/| | | |||||
* | | | | Merge "resolved conflicts for merge of 7545accf to master" | Elliott Hughes | 2015-03-10 | 2 | -6/+8 |
|\ \ \ \ | |||||
| * \ \ \ | resolved conflicts for merge of 7545accf to master | Elliott Hughes | 2015-03-10 | 2 | -6/+8 |
| |\ \ \ \ | |||||
| | * \ \ \ | am 6291bedd: am 63d43949: Merge "Use the icu:: namespace for icu4c API." | Elliott Hughes | 2015-03-09 | 2 | -5/+7 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | am 63d43949: Merge "Use the icu:: namespace for icu4c API." | Elliott Hughes | 2015-03-09 | 2 | -5/+7 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | Merge "Use the icu:: namespace for icu4c API." | Elliott Hughes | 2015-03-09 | 2 | -5/+7 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Use the icu:: namespace for icu4c API. | Elliott Hughes | 2015-03-07 | 2 | -5/+7 |
* | | | | | | | | | Merge "Glop based composeLayerRegion/Rect" | Chris Craik | 2015-03-10 | 9 | -48/+112 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Glop based composeLayerRegion/Rect | Chris Craik | 2015-03-09 | 9 | -48/+112 |
* | | | | | | | | | | Merge "Rename and simplify DisplayList Canvas classes" | Chris Craik | 2015-03-10 | 10 | -136/+103 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Rename and simplify DisplayList Canvas classes | Chris Craik | 2015-03-09 | 10 | -136/+103 |
* | | | | | | | | | | am b219eac8: am a05634ff: am 408800c3: am ea9308cf: am a9639fe6: am 2fcc438f:... | Luan Nguyen | 2015-03-10 | 4 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | am a05634ff: am 408800c3: am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778:... | Luan Nguyen | 2015-03-09 | 4 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | am 408800c3: am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs:... | Luan Nguyen | 2015-03-09 | 4 | -0/+9 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new part... | Luan Nguyen | 2015-03-09 | 4 | -0/+9 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear ... | Luan Nguyen | 2015-03-09 | 4 | -0/+9 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ | am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" i... | Luan Nguyen | 2015-03-09 | 4 | -0/+9 |
| | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ \ \ | am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs | Luan Nguyen | 2015-03-09 | 4 | -0/+9 |
| | | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ \ \ \ | Merge "docs: Add new partners to Wear index page" into lmp-docs | Luan Nguyen | 2015-03-09 | 4 | -0/+9 |
| | | | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | * | | | | | | | | | docs: Add new partners to Wear index page | Luan Nguyen | 2015-03-03 | 4 | -0/+9 |
* | | | | | | | | | | | | | | | | | am c90aa638: (-s ours) am 535bf0f8: (-s ours) am d7852b66: (-s ours) Import t... | Geoff Mendal | 2015-03-10 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | am 535bf0f8: (-s ours) am d7852b66: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-03-09 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | am d7852b66: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-03-09 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-03-09 | 2 | -8/+8 |
* | | | | | | | | | | | | | | | | | am 89d0c0fb: am bcea1fcd: am f1eab6f5: am 39d47c7c: am a2d342e3: am beed9332:... | Eric Gilmore | 2015-03-10 | 5 | -1300/+209 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | am bcea1fcd: am f1eab6f5: am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf:... | Eric Gilmore | 2015-03-09 | 5 | -1300/+209 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | am f1eab6f5: am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Rewor... | Eric Gilmore | 2015-03-09 | 5 | -1300/+209 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofenci... | Eric Gilmore | 2015-03-06 | 5 | -1300/+209 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | | | am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training t... | Eric Gilmore | 2015-03-06 | 5 | -1300/+209 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | |||||
| | | | | * | | | | | | | | | | | | am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and... | Eric Gilmore | 2015-03-06 | 5 | -1300/+209 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / | |||||
| | | | | | * | | | | | | | | | | | am 0bceaacf: Merge "Reworking geofencing training to new API and sample." int... | Eric Gilmore | 2015-03-06 | 5 | -1300/+209 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / | |||||
| | | | | | | * | | | | | | | | | | Merge "Reworking geofencing training to new API and sample." into lmp-docs | Eric Gilmore | 2015-03-06 | 5 | -1300/+209 |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | * | | | | | | | | | | Reworking geofencing training to new API and sample. | Eric Gilmore | 2015-03-06 | 5 | -1300/+209 |
* | | | | | | | | | | | | | | | | | | am f507759e: am e442d914: am ad97ca81: am 4c0b2345: am 8f9ae232: am 36d008c5:... | Glenn Kasten | 2015-03-10 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | am e442d914: am ad97ca81: am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f:... | Glenn Kasten | 2015-03-09 | 2 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | am ad97ca81: am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos | Glenn Kasten | 2015-03-09 | 2 | -5/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos | Glenn Kasten | 2015-03-06 | 2 | -5/+5 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | | | am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos | Glenn Kasten | 2015-03-06 | 2 | -5/+5 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | |||||
| | | | | * | | | | | | | | | | | | am 36d008c5: am 5afdc97f: Fix USB typos | Glenn Kasten | 2015-03-06 | 2 | -5/+5 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / |