summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for a0bc2e7e to lmp-mr1-devDeepanshu Gupta2014-12-302-0/+45
* 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
* | 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
| |/
* | AAPT: Dump status of required flag for uses-featureAdam Lesinski2014-12-081-5/+3
|/
* 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 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 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
* | | | 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
* | | | AAPT: Add pathMotion custom classes to Proguard Keep setAdam Lesinski2014-12-021-6/+9
* | | | AAPT: Add custom transition classes to Proguard keep setAdam Lesinski2014-12-021-0/+9
| |_|/ |/| |
* | | 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
* | | | Fix issue with call backs from media process.Dianne Hackborn2014-11-192-1/+14
* | | | Merge "Move device admin max screen off timeout to internal interface." into ...Jeff Brown2014-11-111-5/+0
|\ \ \ \
| * | | | Move device admin max screen off timeout to internal interface.Jeff Brown2014-11-061-5/+0
* | | | | Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-devAdam Lesinski2014-11-111-0/+7
|\ \ \ \ \
| * | | | | AAPT: Ignore densities specified in -c flagAdam Lesinski2014-11-101-0/+7
* | | | | | am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into l...Deepanshu Gupta2014-11-112-1/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-devDeepanshu Gupta2014-11-112-1/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Don't skip loading object animator.Deepanshu Gupta2014-11-112-1/+2
| | | |_|/ | | |/| |
* | | | | split-select: fix OSX buildAdam Lesinski2014-11-103-6/+6
| |_|/ / |/| | |
* | | | am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automer...Deepanshu Gupta2014-11-101-0/+17
|\ \ \ \ | |/ / /
| * | | Merge "Fix setting styles in custom views." into lmp-devDeepanshu Gupta2014-11-101-0/+17
| |\ \ \ | | |/ /
| | * | Fix setting styles in custom views.Deepanshu Gupta2014-11-101-0/+17
* | | | am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev ...Deepanshu Gupta2014-11-1020-59/+798
|\ \ \ \ | |/ / /
| * | | Merge "Add primitive shadows support to LayoutLib" into lmp-devDeepanshu Gupta2014-11-1020-59/+798
| |\ \ \ | | |/ /
| | * | Add primitive shadows support to LayoutLibDeepanshu Gupta2014-11-0720-59/+798
* | | | am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev autom...Deepanshu Gupta2014-11-102-50/+43
|\ \ \ \ | |/ / /
| * | | Merge "Remove needlessly thrown IOException." into lmp-devDeepanshu Gupta2014-11-102-50/+43
| |\ \ \ | | |/ /
| | * | Remove needlessly thrown IOException.Deepanshu Gupta2014-11-062-50/+43
* | | | Merge "split-select: Fix rules generated for anydpi density" into lmp-mr1-devAdam Lesinski2014-11-1012-245/+350
|\ \ \ \
| * | | | split-select: Fix rules generated for anydpi densityAdam Lesinski2014-11-0612-245/+350
| | |_|/ | |/| |
* | | | Fix inset hinting when adding windowAdrian Roos2014-11-101-4/+4
* | | | Adding bounce animation for affiliated tasks. (Bug 16656169)Winson Chung2014-11-061-0/+5
|/ / /
* | | Merge "Add error checking to aapt for split generation" into lmp-mr1-devAdam Lesinski2014-11-058-5/+237
|\ \ \
| * | | Add error checking to aapt for split generationAdam Lesinski2014-11-038-5/+237
* | | | am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev autom...Deepanshu Gupta2014-11-044-35/+30
|\ \ \ \ | | |/ / | |/| |
generated by cgit v1.1 at 2024-09-11 17:14:56 +0000