summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gingerbread' of git://git.omapzoom.org/platform/frameworks/base...Steve Kondik2011-09-2912-207/+375
|\
| * Bring in more layout lib changes from hc-mr1.Xavier Ducrohet2011-06-1612-192/+322
| * CherryPick 06942bc4 from hc-mr1. do not merge.Xavier Ducrohet2011-06-162-4/+9
| * CherryPick 988eeeb5 from hc-mr1. do not merge.Xavier Ducrohet2011-06-163-16/+49
| * Cherrypick d1ed33c4 from hc-mr1. do not merge.Xavier Ducrohet2011-06-033-0/+86
| * Cherrypick 5b61ea6b from hc-mr1Xavier Ducrohet2011-06-031-1/+1
| * LayoutLib: enable the LAYOUT_ONLY capability.Xavier Ducrohet2011-06-021-1/+1
| * Merge dba35f1b from honeycomb-mr1. do not merge.Xavier Ducrohet2011-06-017-16/+13
| * Merge 6103e22c from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-241-53/+58
| * Merge 2402ad60 from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-231-1/+1
| * Merge e57aa434 from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-203-32/+72
| * Merge 05b7b69c from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-193-22/+33
| * Merge 2fae858d from Honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-1911-51/+799
* | telephony: MccTable: Updates for worldwide needsLadios Jonquil2011-08-191-0/+67
* | Merge branch 'gingerbread' of git://android.git.kernel.org/platform/framework...Steve Kondik2011-07-2620-165/+1052
* | Normalize output of XMLtree contentShachar Shemesh2011-05-061-1/+2
* | Merge branch 'gingerbread' of git://android.git.kernel.org/platform/framework...Steve Kondik2011-04-30134-8364/+16607
|\ \ | |/
| * LayoutLib: don't render when shader's local matrix is set to 0 scale.Xavier Ducrohet2011-04-062-18/+35
| * Merge c5aeac7f from honeycomb.Xavier Ducrohet2011-04-061-23/+75
| * Merge 67450db0 from honeycomb. Do not merge.Xavier Ducrohet2011-03-171-11/+4
| * Merge 9d76581f from honeycomb. do not merge.Xavier Ducrohet2011-03-152-30/+52
| * Merge adaa12cd from honeycomb. do not merge.Xavier Ducrohet2011-03-153-12/+23
| * Merge 6f2fb570 from honeycomb. do not merge.Xavier Ducrohet2011-03-142-14/+10
| * Merge c12b4093 from honeycomb. do not merge.Xavier Ducrohet2011-03-141-25/+80
| * Merge 1911a6f7 into gingerbread. do not merge.Xavier Ducrohet2011-02-2512-66/+67
| * LayoutLib: Adapt the HC layoutlib to GB. do not merge.Xavier Ducrohet2011-02-2340-1422/+296
| * LayoutLib: Original import of Honeycomb's layoutlib. do not merge.Xavier Ducrohet2011-02-23141-8401/+17623
* | Add --non-constant-id to aapt.Xavier Ducrohet2011-03-023-6/+20
* | Merge branch 'gingerbread' of git://android.git.kernel.org/platform/framework...Steve Kondik2011-02-281-2/+2
|\ \ | |/
| * GL texture filtering changed from AND to OR, so rename tag name to match.Dan Morrill2010-12-131-2/+2
* | Make AaptGroupEntry::getMncName accept mnc00Johan Redestig2011-02-051-5/+3
* | Normalize output from aapt dShachar Shemesh2011-02-051-2/+4
* | Merge branch 'themes-exp-2.3.1_r1' of https://github.com/tmobile/themes-platf...Steve Kondik2011-01-213-4/+28
|\ \
| * \ Merge commit 'android-2.3.1_r1' into themes-exp-2.3.1_r1Josh Guilfoyle2010-12-2327-98/+1309
| |\ \ | | |/
| * | Updated copyright headers.Josh Guilfoyle2010-11-183-0/+3
| * | Merge commit 'themes/themes-eclair' into themes-2.2_r1Dirk Sigurdson2010-07-043-4/+25
| |\ \
| | * | Removed legacy code used in our initial design for themes.Josh Guilfoyle2010-03-011-5/+0
| | * | Merge remote branch 'korg/eclair' into themes-eclairDirk Sigurdson2010-02-077-22/+57
| | |\ \
| | * \ \ Merge branch 'themes-1.5r2' into themes-eclairJosh Guilfoyle2009-11-244-4/+30
| | |\ \ \
| | | * | | Port over aapt -x related change.Sergey Ten2009-08-273-4/+25
| | | * | | Remove more unnecessary code from BridgeContext.java.Josh Guilfoyle2009-08-071-2/+0
| | | * | | Revert "This is a patch I've checked in in the old repo and apparently it was...Josh Guilfoyle2009-08-077-132/+5
| | | * | | Remove old setStyledTheme and getStyledTheme.Josh Guilfoyle2009-07-291-10/+0
| | | * | | Fixed BridgeXmlBlockParser now that I added getAttributeDataTypeJosh Guilfoyle2009-07-291-0/+5
| | | * | | Continued research into TypedArrayComposite designPankaj Kumar2009-07-291-0/+12
| | | * | | This is a patch I've checked in in the old repo and apparently it was not por...Sergey Ten2009-07-147-5/+132
| * | | | | As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk filesDan Morrill2010-06-161-1/+1
* | | | | | Support changing style parent in overlaysMartin Nordholts2011-01-211-14/+0
* | | | | | aapt: Allow raw "%" in unformatted string-arraysJosh Stone2011-01-171-0/+16
| |_|_|_|/ |/| | | |
* | | | | fix xlarge support in aapt for gingerbreadScott Main2010-11-041-2/+2
generated by cgit v1.1 at 2024-05-18 00:14:01 +0000