summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | * | | | | | am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as...Deepanshu Gupta2014-05-131-0/+3
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | |/ / / / /
| | | | | | | | | | | * | | | | am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO N...Deepanshu Gupta2014-05-131-0/+3
| | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | |/ / / /
| | | | | | | | | | | | * | | | am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]Deepanshu Gupta2014-05-131-0/+3
| | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | |/ / /
| | | | | | | | | | | | | * | | Set default text style in layoutlib as NORMAL [DO NOT MERGE]Deepanshu Gupta2014-05-061-0/+3
| | | | | | | | | | * | | | | | am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-lig...Deepanshu Gupta2014-05-131-3/+5
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | |/ / / / /
| | | | | | | | | | | * | | | | am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in l...Deepanshu Gupta2014-05-131-3/+5
| | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | |/ / / /
| | | | | | | | | | | | * | | | am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO...Deepanshu Gupta2014-05-131-3/+5
| | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | |/ / /
| | | | | | | | | | | | | * | | Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-05-061-3/+5
| | | | | | | | | | * | | | | | am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO N...Deepanshu Gupta2014-05-131-2/+2
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | |/ / / / /
| | | | | | | | | | | * | | | | am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]Deepanshu Gupta2014-05-131-2/+2
| | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | |/ / / /
| | | | | | | | | | | | * | | | am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]Deepanshu Gupta2014-05-131-2/+2
| | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | |/ / /
| | | | | | | | | | | | | * | | Fix a bug in Nine Patch library. [DO NOT MERGE]Deepanshu Gupta2014-05-061-2/+2
| | | | | | | | | | * | | | | | am 8c5c2410: am 7bb8de58: am a2b34c96: Optimize layout rendering in layoutlib...Deepanshu Gupta2014-05-131-2/+2
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | |/ / / / /
| | | | | | | | | | | * | | | | am 7bb8de58: am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-05-131-2/+2
| | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | |/ / / /
| | | | | | | | | | | | * | | | am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-05-131-2/+2
| | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | |/ / /
| | | | | | | | | | | | | * | | Optimize layout rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-05-061-2/+2
| | | | | | | | | | * | | | | | am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT ...Deepanshu Gupta2014-05-132-3/+102
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | |/ / / / /
| | | | | | | | | | | * | | | | am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]Deepanshu Gupta2014-05-132-3/+102
| | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | |/ / / /
| | | | | | | | | | | | * | | | am e183855c: Add methods for Time_Delegate [DO NOT MERGE]Deepanshu Gupta2014-05-132-3/+102
| | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | |/ / /
| | | | | | | | | | | | | * | | Add methods for Time_Delegate [DO NOT MERGE]Deepanshu Gupta2014-05-062-3/+102
| | | | | | | | | | * | | | | | am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-05-131-1/+0
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | |/ / / / /
| | | | | | | | | | | * | | | | am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-05-131-1/+0
| | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | |/ / / /
| | | | | | | | | | | | * | | | am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-05-131-1/+0
| | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | |/ / /
| | | | | | | | | | | | | * | | Fix NPE in layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-05-061-1/+0
| | | | | | | | | | * | | | | | am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO ...Deepanshu Gupta2014-05-131-1/+1
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | |/ / / / /
| | | | | | | | | | | * | | | | am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]Deepanshu Gupta2014-05-131-1/+1
| | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | |/ / / /
| | | | | | | | | | | | * | | | am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]Deepanshu Gupta2014-05-131-1/+1
| | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | |/ / / | | | | | | | | | | | | | | / / | | | | | | | | | | | | | |/ / | | | | | | | | | | | | |/| |
| | | | | | | | | | | | | * | Fix text size in Fake Action Bar. [DO NOT MERGE]Deepanshu Gupta2014-05-061-1/+1
| | | | | | | | | | * | | | | am ed98abec: am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plu...Deepanshu Gupta2014-05-1327-443/+1820
| | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | |/ / / /
| | | | | | | | | | | * | | | am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aospDeepanshu Gupta2014-05-1327-443/+1820
| | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | |/ / /
| | | | | | | | | | | | * | | resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aospDeepanshu Gupta2014-05-1227-443/+1820
| | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | |/ /
| | | | | | | | | | | | | * | Remove references to non-std Java classes. [DO NOT MERGE]Deepanshu Gupta2014-05-0627-443/+1820
| | | | | | | | | | * | | | | am 2cbe100a: am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in ...Deepanshu Gupta2014-05-131-2/+5
| | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | |/ / / /
| | | | | | | | | | | * | | | am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [D...Deepanshu Gupta2014-05-131-2/+5
| | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | |/ / /
| | | | | | | | | | | | * | | am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-05-131-2/+5
| | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | |/ /
| | | | | | | | | | | | | * | Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-05-051-2/+5
| | | | | | | | | | * | | | | am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the...Deepanshu Gupta2014-05-138-7/+6
| | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | |/ / / /
| | | | | | | | | | | * | | | am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. ...Deepanshu Gupta2014-05-138-7/+6
| | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | |/ / /
| | | | | | | | | | | | * | | am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]Deepanshu Gupta2014-05-138-7/+6
| | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | |/ /
| | | | | | | | | | | | | * | Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]Deepanshu Gupta2014-05-058-7/+6
* | | | | | | | | | | | | | | Merge "Quick fix to ensure mipmap doesn't get stripped by AAPT"Adam Lesinski2014-05-132-3/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Quick fix to ensure mipmap doesn't get stripped by AAPTAdam Lesinski2014-05-132-3/+18
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | am 567f948b: am 872a5a1a: am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13:...Deepanshu Gupta2014-05-131-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| / / / / / / / / / / / / / | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 872a5a1a: am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b:...Deepanshu Gupta2014-05-131-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a:...Deepanshu Gupta2014-05-131-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96:...Deepanshu Gupta2014-05-131-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9:...Deepanshu Gupta2014-05-131-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / /
| | | | | * | | | | | | | | am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00:...Deepanshu Gupta2014-05-131-0/+1
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / /
| | | | | | * | | | | | | | am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for me...Deepanshu Gupta2014-05-131-0/+1
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / /
| | | | | | | * | | | | | | am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e6...Deepanshu Gupta2014-05-131-0/+1
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | |/ / / / / /