summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am fa794eb0: am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix f...Diego Perez2015-06-152-2/+6
|\
| * am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on...Diego Perez2015-06-152-2/+6
| |\
| | * am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor...Diego Perez2015-06-152-2/+6
| | |\
| | | * am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr...Diego Perez2015-06-152-2/+6
| | | |\
| | | | * Merge "Fix for shadows on theme editor" into lmp-mr1-devDiego Perez2015-06-152-2/+6
| | | | |\
| | | | | * Fix for shadows on theme editorDiego Perez2015-06-022-2/+6
* | | | | | am 40a216d9: am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix G...Diego Perez2015-06-151-2/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot dra...Diego Perez2015-06-151-2/+13
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when...Diego Perez2015-06-151-2/+13
| | |\ \ \ \ | | | |/ / /
| | | * | | am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is ...Diego Perez2015-06-151-2/+13
| | | |\ \ \ | | | | |/ /
| | | | * | Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-devDiego Perez2015-06-151-2/+13
| | | | |\ \
| | | | | * | Fix GcSnapshot drawInLayer when clipping is used.Diego Perez2015-05-071-2/+13
* | | | | | | am ce5a79da: am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New c...Diego Perez2015-06-157-2/+357
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets...Diego Perez2015-06-127-2/+357
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets library" int...Diego Perez2015-06-127-2/+357
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-devDiego Perez2015-06-127-2/+357
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge "New custom widgets library" into lmp-mr1-devDiego Perez2015-06-127-2/+357
| | | | |\ \ \
| | | | | * | | New custom widgets libraryDiego Perez2015-05-147-2/+357
| | | | | | |/ | | | | | |/|
* | | | | | | resolved conflicts for merge of 5a53816b to mnc-devDiego Perez2015-06-151-3/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c051c556: am e10e8005: am 68155986: am f5a99437: Merge "Fix crash when sha...Diego Perez2015-06-121-2/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am e10e8005: am 68155986: am f5a99437: Merge "Fix crash when shadowSize is 0"...Diego Perez2015-06-121-2/+9
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 68155986: am f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1...Diego Perez2015-06-121-2/+9
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Fix crash when shadowSize is 0Diego Perez2015-05-081-2/+9
| | | | |/ /
| * | | | | am 037c9cac: Merge "Fix build." into cw-d-mr1-devFilip Gruszczynski2015-05-211-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fix build." into cw-d-mr1-devFilip Gruszczynski2015-05-211-1/+1
| | |\ \ \ \
| | | * | | | Fix build.Filip Gruszczynski2015-05-201-1/+1
| | | |/ / /
* | | | | | Merge "Support AppBar from Material Design." into mnc-devJens Ole Lauridsen2015-06-124-1/+182
|\ \ \ \ \ \
| * | | | | | Support AppBar from Material Design.Jens Ole Lauridsen2015-06-114-1/+182
* | | | | | | Configure auto-rotation tilt tolerance in config.xml.Jeff Brown2015-06-112-1/+3
|/ / / / / /
* | | | | | AAPT2: Proguard rules generation added.Adam Lesinski2015-06-0911-6/+458
* | | | | | AAPT2: Add manifest mergingAdam Lesinski2015-06-046-16/+599
* | | | | | Merge "AAPT2: Change xml file parsing to DOM based" into mnc-devAdam Lesinski2015-06-0412-830/+1272
|\ \ \ \ \ \
| * | | | | | AAPT2: Change xml file parsing to DOM basedAdam Lesinski2015-06-0412-830/+1272
* | | | | | | Merge "aapt: add option for stricter symbol generation" into mnc-devAdrian Roos2015-06-025-3/+49
|\ \ \ \ \ \ \
| * | | | | | | aapt: add option for stricter symbol generationAdrian Roos2015-06-025-3/+49
* | | | | | | | LayoutLib: Skip classes from java package.Deepanshu Gupta2015-06-011-1/+3
* | | | | | | | Skip warnings for some unresolved references.Deepanshu Gupta2015-06-011-0/+41
|/ / / / / / /
* | | | | | | Merge "Revert "Revert "Fix build.""" into mnc-devFilip Gruszczynski2015-06-011-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Revert "Revert "Fix build.""Filip Gruszczynski2015-06-011-1/+1
* | | | | | | | Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"""...Filip Gruszczynski2015-06-011-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""Filip Gruszczynski2015-05-271-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Fix ParserFactory not initialized error.Deepanshu Gupta2015-05-301-3/+3
* | | | | | | | Fix NPE in BridgeContext.obtainStyledAttributes()Deepanshu Gupta2015-05-281-1/+2
* | | | | | | | Fix BridgeTypedArray.getType()Deepanshu Gupta2015-05-281-8/+114
|/ / / / / / /
* | | | | | | Merge "Include Shapes in LayoutLib." into mnc-devDeepanshu Gupta2015-05-261-3/+1
|\ \ \ \ \ \ \
| * | | | | | | Include Shapes in LayoutLib.Deepanshu Gupta2015-05-261-3/+1
* | | | | | | | Merge "LayoutLib: Support getting resource arrays." into mnc-devDeepanshu Gupta2015-05-2622-14/+245
|\ \ \ \ \ \ \ \
| * | | | | | | | LayoutLib: Support getting resource arrays.Deepanshu Gupta2015-05-2622-14/+245
* | | | | | | | | Merge "LayoutLib: Change nullity annotations." into mnc-devDeepanshu Gupta2015-05-2636-53/+57
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | |
| * | | | | | | LayoutLib: Change nullity annotations.Deepanshu Gupta2015-05-2236-53/+57