summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am eb0e0f46: am 2e7427f3: Merge "Add LFH offset to verbose list of APK" into ...Kenny Root2010-08-252-8/+9
|\
| * Merge "Add LFH offset to verbose list of APK" into gingerbreadKenny Root2010-08-252-8/+9
| |\
| | * Add LFH offset to verbose list of APKKenny Root2010-08-252-8/+9
| * | Fix linux 64 buildBrian Carlstrom2010-08-242-2/+2
| |/
* | am 8b569c8d: am 42f90ca5: Merge "Fix aapt dump badging to support xlarge scre...Dianne Hackborn2010-08-241-0/+9
|\ \
| * \ am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into gi...Dianne Hackborn2010-08-201-0/+9
| |\ \ | | |/
| | * Fix aapt dump badging to support xlarge screens.Dianne Hackborn2010-08-201-0/+9
* | | am 821afa9a: am 54d41379: Merge "Add OBB flags to support overlays" into ging...Kenny Root2010-08-211-11/+10
|\ \ \ | |/ /
| * | am 54d41379: Merge "Add OBB flags to support overlays" into gingerbreadKenny Root2010-08-191-11/+10
| |\ \ | | |/
| | * Add OBB flags to support overlaysKenny Root2010-08-181-11/+10
* | | Update aapt to find fragment references.Dianne Hackborn2010-08-201-1/+2
* | | am 8cfd3c01: am e05184f2: Merge "Output proguard keep flags for fragment clas...Ying Wang2010-08-161-18/+48
|\ \ \ | |/ /
| * | am e05184f2: Merge "Output proguard keep flags for fragment classes." into gi...Ying Wang2010-08-131-18/+48
| |\ \ | | |/
| | * Merge "Output proguard keep flags for fragment classes." into gingerbreadYing Wang2010-08-131-18/+48
| | |\
| | | * Output proguard keep flags for fragment classes.Ying Wang2010-08-131-18/+48
* | | | am d22a1e89: am 244152bf: Merge "Change aapt\'s warning message to suggest fo...Eric Fischer2010-08-161-1/+1
|\ \ \ \ | |/ / /
| * | | am 244152bf: Merge "Change aapt\'s warning message to suggest formatted="fals...Eric Fischer2010-08-131-1/+1
| |\ \ \ | | |/ /
| | * | Merge "Change aapt's warning message to suggest formatted="false", not "true"...Eric Fischer2010-08-131-1/+1
| | |\ \
| | | * | Change aapt's warning message to suggest formatted="false", not "true".Eric Fischer2010-08-131-1/+1
| | | |/
| * | | am 7525c2cf: Merge "Add --max-res-version flag to aapt." into gingerbreadFicus Kirkpatrick2010-08-133-0/+26
| |\ \ \ | | |/ /
| | * | Add --max-res-version flag to aapt.Ficus Kirkpatrick2010-08-133-0/+26
| | |/
* | | Add --max-res-version flag to aapt.Ficus Kirkpatrick2010-08-133-0/+26
* | | am 80328ba0: am 8ea71511: Merge "Initial tool for OBB manipulation" into ging...Kenny Root2010-08-112-0/+255
|\ \ \ | |/ /
| * | am 8ea71511: Merge "Initial tool for OBB manipulation" into gingerbreadKenny Root2010-08-112-0/+255
| |\ \ | | |/
| | * Initial tool for OBB manipulationKenny Root2010-08-112-0/+255
| | * Fix the layoutlib Paint.set(Paint) method. Do not merge.Xavier Ducrohet2010-07-191-0/+2
* | | am f781b4ef: am e37ab632: Merge "Fix build on some linux machines"Jean-Baptiste Queru2010-08-112-2/+2
|\ \ \ | |/ /
| * | am e37ab632: Merge "Fix build on some linux machines"Jean-Baptiste Queru2010-08-112-2/+2
| |\ \
| | * | Fix build on some linux machineshmepas2010-08-112-2/+2
* | | | Make libhwui entirely optional.Romain Guy2010-08-081-23/+0
* | | | am 3d02b48b: merge from open-source masterThe Android Open Source Project2010-07-191-0/+2
|\ \ \ \ | |/ / /
| * | | merge from open-source masterThe Android Open Source Project2010-07-191-0/+2
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Fix the layoutlib Paint.set(Paint) method.Xavier Ducrohet2010-07-161-0/+2
| | * am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API...Dan Morrill2010-06-171-1/+1
| | |\
| | * \ am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an...Joe Onorato2010-06-152-1/+8
| | |\ \
| | * \ \ am 5474902f: Merge "xhdpi" into froyoDianne Hackborn2010-06-041-0/+5
| | |\ \ \
* | | \ \ \ am 92a47ea3: am 562124e8: Merge "Clean up some style in the makefiles." into ...Joe Onorato2010-07-151-3/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Clean up some style in the makefiles.Joe Onorato2010-07-141-3/+5
* | | | | | Fixes a few minor problems with AAPTSteve Block2010-06-257-8/+15
* | | | | | am dde1ae84: am 45378f07: am 6b22d81a: As Donut (API=4) devices and earlier d...Dan Morrill2010-06-171-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API...Dan Morrill2010-06-171-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk filesDan Morrill2010-06-151-1/+1
| | | |_|/ | | |/| |
* | | | | am 3d6ea3bd: am 9a5fcd1c: am 9d71860e: Merge "The aapt and aidl tools are pre...Joe Onorato2010-06-152-1/+8
|\ \ \ \ \ | |/ / / /
| * | | | am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an...Joe Onorato2010-06-152-1/+8
| |\ \ \ \ | | |/ / /
| | * | | The aapt and aidl tools are prebuilt when we're doing an apps-only build, so ...Joe Onorato2010-06-102-1/+8
| | | |/ | | |/|
* | | | resolved conflicts for merge of 9e660c82 to masterJeff Brown2010-06-131-1/+10
|\ \ \ \ | |/ / /
| * | | Native input dispatch rewrite work in progress.Jeff Brown2010-06-131-1/+10
* | | | am fc15bd94: am 168585ed: am 5474902f: Merge "xhdpi" into froyoDianne Hackborn2010-06-061-0/+5
|\ \ \ \ | |/ / /
| * | | am 5474902f: Merge "xhdpi" into froyoDianne Hackborn2010-06-061-0/+5
| |\ \ \ | | |/ /
| | * | xhdpiDianne Hackborn2010-06-041-0/+5