summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am e773c20d: am 693236b3: am c263a07a: am 862f5900: am 44b5a1c8: am e541f350:...Deepanshu Gupta2015-03-253-12/+35
|\
| * am c263a07a: am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for run...Deepanshu Gupta2015-03-253-12/+35
| |\
| | * am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfiguration...Deepanshu Gupta2015-03-253-12/+35
| | |\
| | | * am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-devDeepanshu Gupta2015-03-253-12/+35
| | | |\
| | | | * am e541f350: Merge "Update JRE for runConfigurations." into lmp-devDeepanshu Gupta2015-03-243-12/+35
| | | | |\
| | | | | * Merge "Update JRE for runConfigurations." into lmp-devDeepanshu Gupta2015-03-243-12/+35
| | | | | |\
| | | | | | * Update JRE for runConfigurations.Deepanshu Gupta2015-03-183-12/+35
| | | | * | | am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-devDeepanshu Gupta2015-03-242-2/+28
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Merge "Fix project settings. [DO NOT MERGE]" into lmp-devDeepanshu Gupta2015-03-242-2/+28
| | | | | |\ \ | | | | | | |/
| | | | | | * Fix project settings. [DO NOT MERGE]Deepanshu Gupta2015-03-182-2/+28
* | | | | | | am e2b85016: am ce2b74f7: am e51f5cdc: am e97079d9: am a16bb347: am 44fea603:...Deepanshu Gupta2015-03-251-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am e51f5cdc: am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radi...Deepanshu Gupta2015-03-251-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp...Deepanshu Gupta2015-03-251-2/+2
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-devDeepanshu Gupta2015-03-251-2/+2
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | am 44fea603: Merge "Fix RoundRect radius." into lmp-devDeepanshu Gupta2015-03-241-2/+2
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Merge "Fix RoundRect radius." into lmp-devDeepanshu Gupta2015-03-241-2/+2
| | | | | |\ \
| | | | | | * | Fix RoundRect radius.Deepanshu Gupta2015-03-241-2/+2
| | | | | | |/
* | | | | | | am 659413d6: am 5c03cd8a: am 96a67430: am 2b98abde: am 8f9ebc65: am 3bd5cbb1:...Deepanshu Gupta2015-03-255-20/+65
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 96a67430: am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors f...Deepanshu Gupta2015-03-255-20/+65
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar...Deepanshu Gupta2015-03-255-20/+65
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar....Deepanshu Gupta2015-03-255-20/+65
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-devDeepanshu Gupta2015-03-245-20/+65
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Merge "Use right colors for status bar and nav bar." into lmp-devDeepanshu Gupta2015-03-245-20/+65
| | | | | |\ \
| | | | | | * | Use right colors for status bar and nav bar.Deepanshu Gupta2015-03-225-20/+65
| | | | | | |/
* | | | | | | am eb96b231: am 25557e0a: am 5f0252de: am 6fa9d554: am 0b76cf6f: am 34751c79:...Deepanshu Gupta2015-03-252-69/+177
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5f0252de: am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." i...Deepanshu Gupta2015-03-252-69/+177
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-devDeepanshu Gupta2015-03-252-69/+177
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-devDeepanshu Gupta2015-03-252-69/+177
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | am 34751c79: Merge "Better shadows." into lmp-devDeepanshu Gupta2015-03-242-69/+177
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Merge "Better shadows." into lmp-devDeepanshu Gupta2015-03-242-69/+177
| | | | | |\ \
| | | | | | * | Better shadows.Deepanshu Gupta2015-03-242-69/+177
| | | | | | |/
* | | | | | | am f0e713a6: am 01f9ad1c: am 2ceb310d: am 5bc625d8: am a62a18e3: am 311a0f54:...Deepanshu Gupta2015-03-2521-37/+97
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 2ceb310d: am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib test...Deepanshu Gupta2015-03-2521-37/+97
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-devDeepanshu Gupta2015-03-2521-37/+97
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-devDeepanshu Gupta2015-03-2521-37/+97
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | am 311a0f54: Merge "Fix layoutlib tests." into lmp-devDeepanshu Gupta2015-03-2421-37/+97
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Fix layoutlib tests.Deepanshu Gupta2015-03-1721-37/+97
| | | | | |/
* | | | | | Fix build.Dianne Hackborn2015-03-241-0/+5
* | | | | | Runtime permissions: per user permission tracking.Svetoslav2015-03-231-0/+6
* | | | | | Merge "Correctly apply android:theme attribute from <include> tag"Alan Viverette2015-03-232-51/+84
|\ \ \ \ \ \
| * | | | | | Correctly apply android:theme attribute from <include> tagAlan Viverette2015-03-202-51/+84
* | | | | | | Merge "Output modified bcp47 tag in ResTable_config::toString()"Adam Lesinski2015-03-203-30/+1
|\ \ \ \ \ \ \
| * | | | | | | Output modified bcp47 tag in ResTable_config::toString()Adam Lesinski2015-03-163-30/+1
* | | | | | | | Merge "split-select: Languages should not be grouped exclusively"Adam Lesinski2015-03-202-11/+7
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | split-select: Languages should not be grouped exclusivelyAdam Lesinski2015-03-102-11/+7
* | | | | | | | am 0634fba5: am 89da4ca6: Merge "Remove unused printapk.cpp."Elliott Hughes2015-03-191-127/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am 89da4ca6: Merge "Remove unused printapk.cpp."Elliott Hughes2015-03-191-127/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Remove unused printapk.cpp.Elliott Hughes2015-03-191-127/+0
* | | | | | | | | Merge "Make sure shaders use a color model compatible with the destination."Diego Perez2015-03-194-8/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make sure shaders use a color model compatible with the destination.Diego Perez2015-03-124-8/+19