summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am 503a4494: am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" i...Adam Lesinski2014-12-162-0/+16
|\
| * 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 22bfb75e: am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attrib...Adam Lesinski2014-12-161-25/+17
|\ \ \ \ | |/ / /
| * | | 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 55188f59: am c765655a: am fbba9b57: Merge "AAPT: Dump status of required f...Adam Lesinski2014-12-091-5/+3
|\ \ \ \ | |/ / /
| * | | 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
| | |/
* | | am e97908d3: Merge commit \'0953ab27\' into manualmergeAdam Lesinski2014-12-052-22/+164
|\ \ \ | |/ /
| * | 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 9c403d85: am 43d0e675: am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge "Ensur...Deepanshu Gupta2014-12-042-38/+34
|\ \ \ \ | |/ / /
| * | | am 43d0e675: am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge "Ensure that Random...Deepanshu Gupta2014-12-042-38/+34
| |\ \ \ | | |/ /
| | * | am 6cbef4bd: am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked."...Deepanshu Gupta2014-12-042-38/+34
| | |\ \
| | | * \ am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-devDeepanshu Gupta2014-12-032-38/+34
| | | |\ \
| | | | * | Ensure that RandomAccessFile is not leaked.Deepanshu Gupta2014-12-022-38/+34
* | | | | | am 940a1e56: am 52a60ff6: am 302a7cc1: am 4628d51a: am 141c7614: Merge "Fix A...Deepanshu Gupta2014-12-0410-108/+333
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 52a60ff6: am 302a7cc1: am 4628d51a: am 141c7614: Merge "Fix AnalogClock re...Deepanshu Gupta2014-12-0410-108/+333
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-devDeepanshu Gupta2014-12-0410-108/+333
| | |\ \ \ \ | | | |/ / /
| | | * | | am 141c7614: Merge "Fix AnalogClock rendering" into lmp-devDeepanshu Gupta2014-12-0310-108/+333
| | | |\ \ \ | | | | |/ /
| | | | * | Fix AnalogClock renderingDeepanshu Gupta2014-11-2610-108/+333
* | | | | | am 028df22f: am c16d1448: am b2ded18a: Merge "resolved conflicts for merge of...Deepanshu Gupta2014-12-041-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am c16d1448: am b2ded18a: Merge "resolved conflicts for merge of fb30a783 to ...Deepanshu Gupta2014-12-041-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | resolved conflicts for merge of fb30a783 to lmp-mr1-devDeepanshu Gupta2014-12-041-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | am 7e55c292: Merge "Fix typos in previous bugfixes." into lmp-devDeepanshu Gupta2014-12-032-2/+2
| | | |\ \ \ | | | | |/ /
| | | | * | Fix typos in previous bugfixes.Deepanshu Gupta2014-11-202-2/+2
* | | | | | am 455550d5: am 72a6aeac: am 91ca64ea: Merge "AAPT: Add pathMotion custom cla...Adam Lesinski2014-12-031-6/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 72a6aeac: am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Progu...Adam Lesinski2014-12-031-6/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | AAPT: Add pathMotion custom classes to Proguard Keep setAdam Lesinski2014-12-021-6/+9
* | | | | | am 3550c6c5: am f17611a2: am 130e30fe: Merge "AAPT: Add custom transition cla...Adam Lesinski2014-12-031-0/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am f17611a2: am 130e30fe: Merge "AAPT: Add custom transition classes to Progu...Adam Lesinski2014-12-031-0/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | AAPT: Add custom transition classes to Proguard keep setAdam Lesinski2014-12-021-0/+9
| | | |_|/ | | |/| |
* | | | | am fbff0191: am 58238d90: am 9ab79551: am 4104abf8: Merge "Fix setTextAppeara...Deepanshu Gupta2014-11-211-10/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 58238d90: am 9ab79551: am 4104abf8: Merge "Fix setTextAppearance for style...Deepanshu Gupta2014-11-211-10/+1
| |\ \ \ \ | | |/ / /
| | * | | am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-devDeepanshu Gupta2014-11-211-10/+1
| | |\ \ \ | | | |/ /
| | | * | am 4104abf8: Merge "Fix setTextAppearance for styles with dots." into lmp-devDeepanshu Gupta2014-11-191-10/+1
| | | |\ \ | | | | |/
| | | | * Merge "Fix setTextAppearance for styles with dots." into lmp-devDeepanshu Gupta2014-11-191-10/+1
| | | | |\
| | | | | * Fix setTextAppearance for styles with dots.Deepanshu Gupta2014-11-181-10/+1
| | | * | | am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-devDeepanshu Gupta2014-11-192-0/+45
| | | |\ \ \ | | | | |/ /
| | | | * | LayoutLib: Stub AM/PM keycodes in Time Picker.Deepanshu Gupta2014-11-182-0/+45
* | | | | | am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process...Dianne Hackborn2014-11-212-1/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process...Dianne Hackborn2014-11-212-1/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix issue with call backs from media process.Dianne Hackborn2014-11-192-1/+14
* | | | | | am d493fa6d: am 537888be: Merge "kill HAVE_LOCALTIME_R"Yabin Cui2014-11-141-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 537888be: Merge "kill HAVE_LOCALTIME_R"Yabin Cui2014-11-131-2/+2
| |\ \ \ \ \
| | * | | | | kill HAVE_LOCALTIME_RYabin Cui2014-11-131-2/+2