summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* 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 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 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 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 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 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
|\ \ \ \ \ | |/ / / /
| * | | | Fix issue with call backs from media process.Dianne Hackborn2014-11-192-1/+14
* | | | | am 537888be: Merge "kill HAVE_LOCALTIME_R"Yabin Cui2014-11-131-2/+2
|\ \ \ \ \
| * | | | | kill HAVE_LOCALTIME_RYabin Cui2014-11-131-2/+2
* | | | | | resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aospDan Albert2014-11-121-1/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Move frameworks/base over to libc++.Dan Albert2014-11-121-1/+0
* | | | | | am 32f7a6d8: Merge "Move device admin max screen off timeout to internal inte...Jeff Brown2014-11-121-5/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
* | | | | | | am da772234: Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1...Adam Lesinski2014-11-111-0/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 8aa93764: Merge "Fixing NULL pointer access causing segmentation fault in ...Adam Lesinski2014-11-111-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge "Fixing NULL pointer access causing segmentation fault in aapt"Adam Lesinski2014-11-111-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fixing NULL pointer access causing segmentation fault in aaptJörgen Ekström2014-11-071-1/+1
* | | | | | | | | am 7ed525bf: am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object anim...Deepanshu Gupta2014-11-112-1/+2
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | 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
| | | | |_|_|_|/ | | | |/| | | |
* | | | | | | | am c78b33d0: Merge "split-select: fix OSX build" into lmp-mr1-dev automerge: ...Adam Lesinski2014-11-111-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | split-select: fix OSX buildAdam Lesinski2014-11-103-6/+6
| | |_|_|_|/ / | |/| | | | |
* | | | | | | am 1521303f: Merge "kill OS_CASE_SENSITIVE"Yabin Cui2014-11-111-1/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | kill OS_CASE_SENSITIVEYabin Cui2014-11-101-1/+2
| | |_|_|/ / | |/| | | |
| * | | | | am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN."Dan Albert2014-10-201-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ am 3f8c7dec: Merge "AAPT: Fix path for final generated resources on Windows" ...Adam Lesinski2014-10-201-1/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly ...Adam Lesinski2014-10-171-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am f47f8855: Merge "Added a daemon mode to aapt to receive streams of command...Jerome Dochez2014-10-104-0/+40
| |\ \ \ \ \ \ \ \