summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Support multiple resource tables with same packageAdam Lesinski2014-06-182-8/+19
* LayoutLib: Fix broken sdk buildsJi-Hwan Lee2014-06-131-1/+1
* am e3e1591c: Merge "Remove lxml dependency." into lmp-preview-devDeepanshu Gupta2014-06-112-4/+3
|\
| * Merge "Remove lxml dependency." into lmp-preview-devDeepanshu Gupta2014-06-102-4/+3
| |\
| | * Remove lxml dependency.Deepanshu Gupta2014-06-102-4/+3
* | | am fe01ace8: Merge "LayoutLib: Support more ContextThemeWrappers" into lmp-pr...Deepanshu Gupta2014-06-113-4/+4
|\ \ \ | |/ /
| * | LayoutLib: Support more ContextThemeWrappersDeepanshu Gupta2014-06-103-4/+4
* | | am 0a89c1b0: Merge "LayoutLib: Fix EditText rendering" into lmp-preview-devDeepanshu Gupta2014-06-115-35/+107
|\ \ \ | |/ /
| * | LayoutLib: Fix EditText renderingDeepanshu Gupta2014-06-105-35/+107
| |/
| * Add support for @SystemApi annotation to aapt. (DO NOT MERGE)Jeff Brown2014-06-091-37/+44
* | Merge "Add support for @SystemApi annotation to aapt."Jeff Brown2014-06-091-37/+44
|\ \
| * | Add support for @SystemApi annotation to aapt.Jeff Brown2014-06-061-37/+44
* | | am 99017c01: Merge "Fix issue preventing aapt from stripping all unwanted den...Bryan Mawhinney2014-06-091-2/+2
|\ \ \ | | |/ | |/|
| * | Merge "Fix issue preventing aapt from stripping all unwanted densities" into ...Bryan Mawhinney2014-06-081-2/+2
| |\ \
| | * | Fix issue preventing aapt from stripping all unwanted densitiesBryan Mawhinney2014-06-061-2/+2
* | | | am e23620e6: Merge "Build LayoutLib with Java 6" into lmp-preview-devDeepanshu Gupta2014-06-092-0/+3
|\ \ \ \ | |/ / /
| * | | Merge "Build LayoutLib with Java 6" into lmp-preview-devDeepanshu Gupta2014-06-072-0/+3
| |\ \ \
| | * | | Build LayoutLib with Java 6Deepanshu Gupta2014-06-072-0/+3
| | |/ /
* | | | Merge "Introduce a sequence number to avoid redundant IPCs"Yohei Yukawa2014-06-091-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Introduce a sequence number to avoid redundant IPCsYohei Yukawa2014-06-091-1/+1
* | | | am 87590b53: Merge "Add missing abstract method override in BridgePowerManage...Amith Yamasani2014-06-061-0/+5
|\ \ \ \ | | |/ / | |/| |
| * | | Add missing abstract method override in BridgePowerManager.Amith Yamasani2014-06-061-0/+5
* | | | am 87bc3c25: Merge "Improvements to low power mode." into lmp-preview-devDianne Hackborn2014-06-061-2/+7
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Merge "Improvements to low power mode." into lmp-preview-devDianne Hackborn2014-06-061-2/+7
| |\ \ | | |/ | |/|
| | * Improvements to low power mode.Dianne Hackborn2014-06-061-2/+7
* | | am ee001119: Merge "LayoutLib: Add assertions for typeface." into lmp-preview...Deepanshu Gupta2014-06-052-7/+22
|\ \ \ | |/ /
| * | LayoutLib: Add assertions for typeface.Deepanshu Gupta2014-06-052-7/+22
* | | am 242dded6: Merge "LayoutLib: Font variants" into lmp-preview-devDeepanshu Gupta2014-06-053-54/+73
|\ \ \ | |/ /
| * | LayoutLib: Font variantsDeepanshu Gupta2014-06-053-54/+73
* | | am 9a9d96bf: Merge "LayoutLib: Add capability to simulate old versions" into ...Deepanshu Gupta2014-06-051-1/+2
|\ \ \ | |/ /
| * | LayoutLib: Add capability to simulate old versionsDeepanshu Gupta2014-06-041-1/+2
| |/
* | Trivial method renaming for notifyTextCommittedYohei Yukawa2014-06-051-5/+4
* | am dfc3bc9b: Fix build.Deepanshu Gupta2014-06-052-5/+5
|\ \ | |/
| * Fix build.Deepanshu Gupta2014-06-042-5/+5
* | am 4c0d33f2: Merge "Add basic support for simulating older versions." into lm...Deepanshu Gupta2014-06-053-13/+50
|\ \ | |/
| * Merge "Add basic support for simulating older versions." into lmp-preview-devDeepanshu Gupta2014-06-043-13/+50
| |\
| | * Add basic support for simulating older versions.Deepanshu Gupta2014-05-283-13/+50
| * | Merge "Distinguish between menus in ActionBar and popup." into lmp-preview-devDeepanshu Gupta2014-06-043-34/+55
| |\ \
| | * | Distinguish between menus in ActionBar and popup.Deepanshu Gupta2014-05-293-34/+55
* | | | am e478c562: am 905e113f: am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0:...Deepanshu Gupta2014-06-041-0/+1
|\ \ \ \
| * \ \ \ am 905e113f: am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f:...Deepanshu Gupta2014-06-041-0/+1
| |\ \ \ \
| | * \ \ \ am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2:...Deepanshu Gupta2014-06-041-0/+1
| | |\ \ \ \
| | | * \ \ \ am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e:...Deepanshu Gupta2014-06-041-0/+1
| | | |\ \ \ \
| | | | * \ \ \ am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247:...Deepanshu Gupta2014-06-041-0/+1
| | | | |\ \ \ \
| | | | | * \ \ \ am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5:...Deepanshu Gupta2014-06-041-0/+1
| | | | | |\ \ \ \
| | | | | | * \ \ \ am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120:...Deepanshu Gupta2014-06-041-0/+1
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved con...Deepanshu Gupta2014-06-041-0/+1
| | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for me...Deepanshu Gupta2014-06-041-0/+1
| | | | | | | | |\ \ \ \
| | | | | | | | | * \ \ \ am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-devDeepanshu Gupta2014-06-041-0/+1
| | | | | | | | | |\ \ \ \
| | | | | | | | | | * \ \ \ am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-devDeepanshu Gupta2014-06-043-34/+55
| | | | | | | | | | |\ \ \ \