summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am 052c4c4b: Merge "Update time in layout preview" into lmp-devDeepanshu Gupta2014-09-301-2/+1
|\
| * Update time in layout previewDeepanshu Gupta2014-09-291-2/+1
* | am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually sh...Adam Lesinski2014-09-262-1/+19
|\ \ | |/
| * AAPT: Fix issue with synthesized resource not actually showing upAdam Lesinski2014-09-242-1/+19
* | am 36b5795f: am 81745c51: Merge "AAPT: Continuation of public/private attribu...Adam Lesinski2014-09-229-36/+316
|\ \ | |/
| * Merge "AAPT: Continuation of public/private attribute fix" into lmp-devAdam Lesinski2014-09-229-36/+316
| |\
| | * AAPT: Continuation of public/private attribute fixAdam Lesinski2014-09-229-36/+316
* | | resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aospDan Albert2014-09-191-3/+1
|\ \ \
| * \ \ am 799812cd: Merge "Clean up makefile cruft."Dan Albert2014-09-191-4/+3
| |\ \ \
| | * | | Clean up makefile cruft.Dan Albert2014-09-111-4/+3
* | | | | am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT publi...Adam Lesinski2014-09-193-3/+225
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Fix backwards compat problem with AAPT public attrs" into lmp-devAdam Lesinski2014-09-193-3/+225
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix backwards compat problem with AAPT public attrsAdam Lesinski2014-09-183-3/+225
* | | | | am 8bdd408b: am 69f09fe8: Merge "Build LayoutLib tests with Java 6" into lmp-devDeepanshu Gupta2014-09-161-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Build LayoutLib tests with Java 6" into lmp-devDeepanshu Gupta2014-09-161-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Build LayoutLib tests with Java 6Deepanshu Gupta2014-09-161-1/+1
* | | | | am 1c1683a3: am 1ddb7a6b: Merge "Saver: PowerManager call to set low power mo...John Spurlock2014-09-141-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | Saver: PowerManager call to set low power mode.John Spurlock2014-09-141-0/+5
* | | | | am 972628dc: am 5128e88e: Merge "Don\'t use reflection when generating the on...Marcin Kosiba2014-09-112-104/+73
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Don't use reflection when generating the onResourcesLoaded callback." ...Marcin Kosiba2014-09-112-104/+73
| |\ \ \ \
| | * | | | Don't use reflection when generating the onResourcesLoaded callback.Marcin Kosiba2014-09-112-104/+73
* | | | | | am 92e039ee: am 8d89d1e0: Merge "LayoutLib: support font weights." into lmp-devDeepanshu Gupta2014-09-113-60/+166
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "LayoutLib: support font weights." into lmp-devDeepanshu Gupta2014-09-113-60/+166
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | LayoutLib: support font weights.Deepanshu Gupta2014-09-103-60/+166
* | | | | | am 803a6f39: am 829b79f6: Merge "Fix build." into lmp-devDianne Hackborn2014-09-101-0/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix build." into lmp-devDianne Hackborn2014-09-101-0/+5
| |\ \ \ \ \
| | * | | | | Fix build.Dianne Hackborn2014-09-091-0/+5
* | | | | | | am 716c7279: am 799dc748: Merge "AAPT: Don\'t crash on illegal symbol name" i...Adam Lesinski2014-09-101-2/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "AAPT: Don't crash on illegal symbol name" into lmp-devAdam Lesinski2014-09-091-2/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | AAPT: Don't crash on illegal symbol nameAdam Lesinski2014-09-091-2/+6
| | | |/ / / | | |/| | |
* | | | | | resolved conflicts for merge of 1d99636f to lmp-dev-plus-aospDan Albert2014-09-091-10/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | am 8085477f: Merge "Don\'t check for null references."Dan Albert2014-09-091-11/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Don't check for null references."Dan Albert2014-09-091-11/+2
| | |\ \ \ \
| | | * | | | Don't check for null references.Dan Albert2014-09-081-11/+2
* | | | | | | Merge "resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp" into lm...Dan Albert2014-09-095-22/+22
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ resolved conflicts for merge of 6c585756 to lmp-dev-plus-aospDan Albert2014-09-085-22/+22
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 2ffa4aab: Merge "Use char16_t for char things."Dan Albert2014-09-096-25/+25
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Use char16_t for char things."Dan Albert2014-09-096-25/+25
| | | |\ \ \ \ \
| | | | * | | | | Use char16_t for char things.Dan Albert2014-09-086-25/+25
* | | | | | | | | am 7e7fbbba: am c52a1286: Merge "Build layoutlib create tests as part of sdk ...Deepanshu Gupta2014-09-091-0/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Build layoutlib create tests as part of sdk build.Deepanshu Gupta2014-09-081-0/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | am de86cf13: am 5a6934c0: Merge "Don\'t pollute the namespace for two uses."Dan Albert2014-09-091-3/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 5a6934c0: Merge "Don\'t pollute the namespace for two uses."Dan Albert2014-09-091-3/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Don't pollute the namespace for two uses.Dan Albert2014-09-081-3/+2
| | | |_|/ / | | |/| | |
| * | | | | am 7c8318c0: Merge "PackageInfo is a class, not a struct"Brian Carlstrom2014-08-171-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | PackageInfo is a class, not a structBrian Carlstrom2014-08-171-2/+2
* | | | | | am 06e6b622: am 1d39bab7: Merge "Update IntelliJ project file for IntelliJ 14...Deepanshu Gupta2014-09-091-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Update IntelliJ project file for IntelliJ 14" into lmp-devDeepanshu Gupta2014-09-091-1/+1
| |\ \ \ \ \
| | * | | | | Update IntelliJ project file for IntelliJ 14Deepanshu Gupta2014-09-081-1/+1
* | | | | | | am ac00fca2: am 45997e76: Merge "Add layoutlib tests to DIST_DIR" into lmp-devDeepanshu Gupta2014-09-092-0/+6
|\ \ \ \ \ \ \ | |/ / / / / /
generated by cgit v1.1 at 2024-12-23 17:07:06 +0000