summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-devDeepanshu Gupta2015-01-071-4/+6
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Fix tests on jenkins, take 2.Deepanshu Gupta2015-01-071-4/+6
* | | | | | | | am fa490b78: am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkinsDeepanshu Gupta2015-01-071-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 7f9582ce: am 48603a39: Fix tests on jenkinsDeepanshu Gupta2015-01-071-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 48603a39: Fix tests on jenkinsDeepanshu Gupta2015-01-071-0/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Fix tests on jenkinsDeepanshu Gupta2015-01-061-0/+1
* | | | | | | | Merge "resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again" into lmp...Deepanshu Gupta2015-01-061-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp againDeepanshu Gupta2015-01-061-1/+0
* | | | | | | | | am aebd7fdb: am 565f2245: am a6671b70: am 6461e054: Merge "Add image comparis...Deepanshu Gupta2015-01-063-0/+343
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | am a6671b70: am 6461e054: Merge "Add image comparison to LayoutLib tests." in...Deepanshu Gupta2015-01-063-0/+343
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-devDeepanshu Gupta2015-01-053-0/+343
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Add image comparison to LayoutLib tests.Deepanshu Gupta2015-01-053-0/+343
* | | | | | | | resolved conflicts for merge of 8c831b2f to lmp-mr1-dev-plus-aospDeepanshu Gupta2015-01-061-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 0db2524c: am b2ebb968: Merge "Remove Time from CreateInfo" into lmp-devDeepanshu Gupta2015-01-061-1/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am b2ebb968: Merge "Remove Time from CreateInfo" into lmp-devDeepanshu Gupta2015-01-051-1/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Remove Time from CreateInfoDeepanshu Gupta2015-01-021-1/+0
* | | | | | | | am c2e9875d: am 229ce665: am 937db7a3: am 53f73a97: Merge "Add DatePicker, Ca...Deepanshu Gupta2015-01-062-2/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 937db7a3: am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib te...Deepanshu Gupta2015-01-062-2/+12
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp...Deepanshu Gupta2015-01-052-2/+12
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Add DatePicker, CalendarView to LayoutLib testsDeepanshu Gupta2015-01-022-2/+12
* | | | | | | | am 84097e39: am b187106c: am e69e4f8b: am f9bb0b5e: Merge "Fix DatePicker ren...Deepanshu Gupta2015-01-061-10/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am e69e4f8b: am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-devDeepanshu Gupta2015-01-061-10/+18
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-devDeepanshu Gupta2015-01-051-10/+18
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Fix DatePicker rendering.Deepanshu Gupta2014-12-291-10/+18
* | | | | | | | am c7fe9793: am 48ab6bec: am 8c686ddd: am d20a518c: Merge "Make Preference-co...Deepanshu Gupta2015-01-064-29/+36
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 8c686ddd: am d20a518c: Merge "Make Preference-cookie map non static." into...Deepanshu Gupta2015-01-064-29/+36
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am d20a518c: Merge "Make Preference-cookie map non static." into lmp-devDeepanshu Gupta2015-01-054-29/+36
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Make Preference-cookie map non static.Deepanshu Gupta2014-12-234-29/+36
* | | | | | | | am addaeff9: am b88a65df: am cec8e5a1: am f861c0ce: Merge "Fix default initia...Deepanshu Gupta2015-01-064-9/+144
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am cec8e5a1: am f861c0ce: Merge "Fix default initial value for preferences" i...Deepanshu Gupta2015-01-064-9/+144
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am f861c0ce: Merge "Fix default initial value for preferences" into lmp-devDeepanshu Gupta2015-01-054-9/+144
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Fix default initial value for preferencesDeepanshu Gupta2014-12-234-9/+144
* | | | | | | | am e15f580b: am 2bd01ebf: am 7ed14549: am 7081a114: Merge "Add preferences re...Deepanshu Gupta2015-01-068-34/+224
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-devDeepanshu Gupta2015-01-068-34/+224
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 7081a114: Merge "Add preferences rendering." into lmp-devDeepanshu Gupta2015-01-058-34/+224
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Add preferences rendering.Deepanshu Gupta2014-12-238-34/+224
* | | | | | | | am 9c8f8ed8: am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-d...Deepanshu Gupta2015-01-052-0/+45
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | resolved conflicts for a0bc2e7e to lmp-mr1-devDeepanshu Gupta2014-12-302-0/+45
* | | | | | | | am 503a4494: am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" i...Adam Lesinski2014-12-162-0/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-devAdam Lesinski2014-12-162-0/+16
| |\ \ \ \ \ \ \
| | * | | | | | | AAPT: Copy android:revisionCode to SplitsAdam Lesinski2014-12-162-0/+16
* | | | | | | | | am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be...Adam Lesinski2014-12-161-25/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "AAPT: attributes showing up after v21 attributes would be removed for ...Adam Lesinski2014-12-151-25/+17
| |\ \ \ \ \ \ \ \
| | * | | | | | | | AAPT: attributes showing up after v21 attributes would be removed for pre-21 ...Adam Lesinski2014-12-101-25/+17
| | |/ / / / / / /
* | | | | | | | | am c765655a: am fbba9b57: Merge "AAPT: Dump status of required flag for uses-...Adam Lesinski2014-12-091-5/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | AAPT: Dump status of required flag for uses-featureAdam Lesinski2014-12-081-5/+3
| |/ / / / / / /
* | | | | | | | Merge commit '0953ab27' into manualmergeAdam Lesinski2014-12-052-22/+164
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-devAdam Lesinski2014-12-042-22/+161
| |\ \ \ \ \ \ \
| | * | | | | | | AAPT: Move private attrs to new type for frameworkAdam Lesinski2014-12-032-22/+161
* | | | | | | | | am 43d0e675: am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge "Ensure that Random...Deepanshu Gupta2014-12-042-38/+34
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /