Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev | Deepanshu Gupta | 2015-01-07 | 1 | -4/+6 | |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | ||||||
| | | * | | | | | Fix tests on jenkins, take 2. | Deepanshu Gupta | 2015-01-07 | 1 | -4/+6 | |
* | | | | | | | | am fa490b78: am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkins | Deepanshu Gupta | 2015-01-07 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am 7f9582ce: am 48603a39: Fix tests on jenkins | Deepanshu Gupta | 2015-01-07 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | am 48603a39: Fix tests on jenkins | Deepanshu Gupta | 2015-01-07 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | ||||||
| | | * | | | | | Fix tests on jenkins | Deepanshu Gupta | 2015-01-06 | 1 | -0/+1 | |
* | | | | | | | | Merge "resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again" into lmp... | Deepanshu Gupta | 2015-01-06 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again | Deepanshu Gupta | 2015-01-06 | 1 | -1/+0 | |
* | | | | | | | | | am aebd7fdb: am 565f2245: am a6671b70: am 6461e054: Merge "Add image comparis... | Deepanshu Gupta | 2015-01-06 | 3 | -0/+343 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | ||||||
| * | | | | | | | am a6671b70: am 6461e054: Merge "Add image comparison to LayoutLib tests." in... | Deepanshu Gupta | 2015-01-06 | 3 | -0/+343 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev | Deepanshu Gupta | 2015-01-05 | 3 | -0/+343 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | ||||||
| | | * | | | | | Add image comparison to LayoutLib tests. | Deepanshu Gupta | 2015-01-05 | 3 | -0/+343 | |
* | | | | | | | | resolved conflicts for merge of 8c831b2f to lmp-mr1-dev-plus-aosp | Deepanshu Gupta | 2015-01-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am 0db2524c: am b2ebb968: Merge "Remove Time from CreateInfo" into lmp-dev | Deepanshu Gupta | 2015-01-06 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | am b2ebb968: Merge "Remove Time from CreateInfo" into lmp-dev | Deepanshu Gupta | 2015-01-05 | 1 | -1/+0 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | ||||||
| | | * | | | | | Remove Time from CreateInfo | Deepanshu Gupta | 2015-01-02 | 1 | -1/+0 | |
* | | | | | | | | am c2e9875d: am 229ce665: am 937db7a3: am 53f73a97: Merge "Add DatePicker, Ca... | Deepanshu Gupta | 2015-01-06 | 2 | -2/+12 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am 937db7a3: am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib te... | Deepanshu Gupta | 2015-01-06 | 2 | -2/+12 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp... | Deepanshu Gupta | 2015-01-05 | 2 | -2/+12 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | ||||||
| | | * | | | | | Add DatePicker, CalendarView to LayoutLib tests | Deepanshu Gupta | 2015-01-02 | 2 | -2/+12 | |
* | | | | | | | | am 84097e39: am b187106c: am e69e4f8b: am f9bb0b5e: Merge "Fix DatePicker ren... | Deepanshu Gupta | 2015-01-06 | 1 | -10/+18 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am e69e4f8b: am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev | Deepanshu Gupta | 2015-01-06 | 1 | -10/+18 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev | Deepanshu Gupta | 2015-01-05 | 1 | -10/+18 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | ||||||
| | | * | | | | | Fix DatePicker rendering. | Deepanshu Gupta | 2014-12-29 | 1 | -10/+18 | |
* | | | | | | | | am c7fe9793: am 48ab6bec: am 8c686ddd: am d20a518c: Merge "Make Preference-co... | Deepanshu Gupta | 2015-01-06 | 4 | -29/+36 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am 8c686ddd: am d20a518c: Merge "Make Preference-cookie map non static." into... | Deepanshu Gupta | 2015-01-06 | 4 | -29/+36 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev | Deepanshu Gupta | 2015-01-05 | 4 | -29/+36 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | ||||||
| | | * | | | | | Make Preference-cookie map non static. | Deepanshu Gupta | 2014-12-23 | 4 | -29/+36 | |
* | | | | | | | | am addaeff9: am b88a65df: am cec8e5a1: am f861c0ce: Merge "Fix default initia... | Deepanshu Gupta | 2015-01-06 | 4 | -9/+144 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am cec8e5a1: am f861c0ce: Merge "Fix default initial value for preferences" i... | Deepanshu Gupta | 2015-01-06 | 4 | -9/+144 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | am f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev | Deepanshu Gupta | 2015-01-05 | 4 | -9/+144 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | ||||||
| | | * | | | | | Fix default initial value for preferences | Deepanshu Gupta | 2014-12-23 | 4 | -9/+144 | |
* | | | | | | | | am e15f580b: am 2bd01ebf: am 7ed14549: am 7081a114: Merge "Add preferences re... | Deepanshu Gupta | 2015-01-06 | 8 | -34/+224 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev | Deepanshu Gupta | 2015-01-06 | 8 | -34/+224 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | am 7081a114: Merge "Add preferences rendering." into lmp-dev | Deepanshu Gupta | 2015-01-05 | 8 | -34/+224 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | ||||||
| | | * | | | | | Add preferences rendering. | Deepanshu Gupta | 2014-12-23 | 8 | -34/+224 | |
* | | | | | | | | am 9c8f8ed8: am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-d... | Deepanshu Gupta | 2015-01-05 | 2 | -0/+45 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | resolved conflicts for a0bc2e7e to lmp-mr1-dev | Deepanshu Gupta | 2014-12-30 | 2 | -0/+45 | |
* | | | | | | | | am 503a4494: am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" i... | Adam Lesinski | 2014-12-16 | 2 | -0/+16 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-dev | Adam Lesinski | 2014-12-16 | 2 | -0/+16 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | AAPT: Copy android:revisionCode to Splits | Adam Lesinski | 2014-12-16 | 2 | -0/+16 | |
* | | | | | | | | | am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be... | Adam Lesinski | 2014-12-16 | 1 | -25/+17 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Merge "AAPT: attributes showing up after v21 attributes would be removed for ... | Adam Lesinski | 2014-12-15 | 1 | -25/+17 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | AAPT: attributes showing up after v21 attributes would be removed for pre-21 ... | Adam Lesinski | 2014-12-10 | 1 | -25/+17 | |
| | |/ / / / / / / | ||||||
* | | | | | | | | | am c765655a: am fbba9b57: Merge "AAPT: Dump status of required flag for uses-... | Adam Lesinski | 2014-12-09 | 1 | -5/+3 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | AAPT: Dump status of required flag for uses-feature | Adam Lesinski | 2014-12-08 | 1 | -5/+3 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge commit '0953ab27' into manualmerge | Adam Lesinski | 2014-12-05 | 2 | -22/+164 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-dev | Adam Lesinski | 2014-12-04 | 2 | -22/+161 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | AAPT: Move private attrs to new type for framework | Adam Lesinski | 2014-12-03 | 2 | -22/+161 | |
* | | | | | | | | | am 43d0e675: am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge "Ensure that Random... | Deepanshu Gupta | 2014-12-04 | 2 | -38/+34 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |