summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am 35d34c67: am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" i...Joe Onorato2010-10-151-7/+10
|\
| * am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbreadJoe Onorato2010-10-141-7/+10
| |\
| | * Do not build pbkdf2gen on non-Linux hostsKenny Root2010-10-141-7/+10
* | | am 8fda1636: am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gi...Kenny Root2010-10-154-11/+192
|\ \ \ | |/ /
| * | am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbreadKenny Root2010-10-134-11/+192
| |\ \ | | |/
| | * Merge "OBB: use PBKDF2 for key generation." into gingerbreadKenny Root2010-10-134-11/+192
| | |\
| | | * OBB: use PBKDF2 for key generation.Kenny Root2010-10-134-11/+192
* | | | resolved conflicts for merge of 8b1082bb to masterKenny Root2010-10-152-1/+13
|\ \ \ \ | |/ / /
| * | | am 3394db7d: Merge "Regenerate preloaded classes for Gingerbread." into ginge...Jesse Wilson2010-10-132-1/+13
| |\ \ \ | | |/ /
| | * | Merge "Regenerate preloaded classes for Gingerbread." into gingerbreadJesse Wilson2010-10-132-1/+13
| | |\ \
| | | * | Regenerate preloaded classes for Gingerbread.Jesse Wilson2010-10-132-1/+13
| | | |/
* | | | am b58af2b8: am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be u...Dan Morrill2010-10-151-0/+9
|\ \ \ \ | |/ / /
| * | | am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to enable...Dan Morrill2010-10-131-0/+9
| |\ \ \ | | |/ /
| | * | Adding a new <uses-gl-texture/> tag, to be used to enable apps to specifyDan Morrill2010-10-131-0/+9
| | |/
| | * Avoid pre-processing images when they won't be usedAnthony Newnam2010-10-061-1/+3
* | | am 556866a2: am 656d2165: Merge "Parser is optional in obtainStyledAttributes...Xavier Ducrohet2010-10-081-5/+11
|\ \ \ | |/ /
| * | am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into ginge...Xavier Ducrohet2010-10-071-5/+11
| |\ \ | | |/
| | * Parser is optional in obtainStyledAttributes.Xavier Ducrohet2010-10-041-5/+11
* | | resolved conflicts for merge of 10d5b096 to masterDianne Hackborn2010-10-041-8/+10
|\ \ \ | |/ /
| * | am 407f625a: Add new API to find out whether external storage is removable.Dianne Hackborn2010-10-041-8/+10
| |\ \ | | |/
| | * Add new API to find out whether external storage is removable.Dianne Hackborn2010-10-041-8/+10
* | | Merge "layoutlib_create: Generate delegate to implement native methods."Raphael2010-10-0415-146/+1139
|\ \ \
| * | | layoutlib_create: Generate delegate to implement native methods.Raphael2010-09-2915-146/+1139
* | | | am 7e40e67f: am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" ...Kenny Root2010-10-011-3/+2
|\ \ \ \ | | |/ / | |/| |
| * | | am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbreadKenny Root2010-10-011-3/+2
| |\ \ \ | | | |/ | | |/|
| | * | Add "none" for vold and deprecate mkobb -cKenny Root2010-10-011-3/+2
* | | | am 4309b52f: am 735de3b3: Hash keys with MD5; track IBinders not IInterfaceKenny Root2010-09-301-9/+21
|\ \ \ \ | |/ / /
| * | | am 735de3b3: Hash keys with MD5; track IBinders not IInterfaceKenny Root2010-09-301-9/+21
| |\ \ \ | | |/ /
| | * | Hash keys with MD5; track IBinders not IInterfaceKenny Root2010-09-301-9/+21
* | | | Drag/drop APIs and infrastructureChristopher Tate2010-09-301-0/+35
* | | | am 0e8dc464: am 292c246b: Merge "Call functions to calculate deps and classes...Ying Wang2010-09-281-8/+4
|\ \ \ \ | |/ / /
| * | | am 292c246b: Merge "Call functions to calculate deps and classes.jar" into gi...Ying Wang2010-09-281-8/+4
| |\ \ \ | | |/ /
| | * | Call functions to calculate deps and classes.jarYing Wang2010-09-281-8/+4
| * | | am d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into g...Dianne Hackborn2010-09-271-0/+6
| |\ \ \ | | |/ /
| | * | Allow all apps to call ContentResolver.getType().Dianne Hackborn2010-09-261-0/+6
* | | | Merge "Improve error reporting in the layoutlib class replacement test."Xavier Ducrohet2010-09-281-3/+39
|\ \ \ \
| * | | | Improve error reporting in the layoutlib class replacement test.Xavier Ducrohet2010-09-281-3/+39
| | |_|/ | |/| |
* | | | Allow all apps to call ContentResolver.getType().Dianne Hackborn2010-09-271-0/+6
|/ / /
* | | am cb7c5498: am 91512f57: Layoutlib_create: Unittest for ClassHasNativeVisitor.Raphael2010-09-244-3/+196
|\ \ \ | |/ /
| * | am 91512f57: Layoutlib_create: Unittest for ClassHasNativeVisitor.Raphael2010-09-244-3/+196
| |\ \
| | * | Layoutlib_create: Unittest for ClassHasNativeVisitor.Raphael2010-09-244-3/+196
* | | | am 9c708358: am 37cedce1: Merge "Add an aapt option to allow string variation...Eric Fischer2010-09-233-5/+95
|\ \ \ \ | |/ / /
| * | | am 37cedce1: Merge "Add an aapt option to allow string variations for differe...Eric Fischer2010-09-233-5/+95
| |\ \ \ | | | |/ | | |/|
| | * | Add an aapt option to allow string variations for different devices.Eric Fischer2010-09-233-5/+95
* | | | Merge "Work on fragments in layouts."Dianne Hackborn2010-09-211-2/+2
|\ \ \ \
| * | | | Work on fragments in layouts.Dianne Hackborn2010-09-211-2/+2
* | | | | am 98699c8f: am f2960b8d: Refresh the layoutlib_create doc.Raphael Moll2010-09-211-36/+164
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am f2960b8d: Refresh the layoutlib_create doc.Raphael Moll2010-09-211-36/+164
| |\ \ \ | | | |/ | | |/|
| | * | Refresh the layoutlib_create doc.Raphael Moll2010-09-211-36/+164
* | | | am c1558df7: am 34d3aeaf: Merge "Add image creator helper script for OBBs" in...Kenny Root2010-09-211-0/+260
|\ \ \ \ | |/ / /