summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am f9705ef6: am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original...Raphael Moll2011-06-238-117/+319
|\
| * am 2b5f2d01: am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate ...Raphael Moll2011-06-228-117/+319
| |\
| | * am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods."Raphael Moll2011-06-228-117/+319
| | |\
| | | * Laoutlib_creator: keep original of delegate methods.Raphael Moll2011-06-178-117/+319
| | * | am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into ging...Xavier Ducrohet2011-06-063-0/+86
| | |\ \
| | | * | Cherrypick d1ed33c4 from hc-mr1. do not merge.Xavier Ducrohet2011-06-033-0/+86
| | * | | am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbreadXavier Ducrohet2011-06-069-18/+15
| | |\ \ \ | | | |/ /
| | | * | 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
| | * | | am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-241-53/+58
| | |\ \ \ | | | |/ /
| | | * | Merge 6103e22c from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-241-53/+58
| | * | | am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-241-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge 2402ad60 from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-231-1/+1
| | * | | am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-233-32/+72
| | |\ \ \ | | | |/ /
| | | * | Merge e57aa434 from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-203-32/+72
| | * | | am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gi...Xavier Ducrohet2011-05-233-22/+33
| | |\ \ \ | | | |/ /
| | | * | Merge 05b7b69c from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-193-22/+33
| | * | | am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gi...Xavier Ducrohet2011-05-2311-51/+799
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/|
| | | * Merge 2fae858d from Honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-1911-51/+799
| | * | am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996Conley Owens2011-04-271-1/+2
| | |\ \
| | | * \ Merge changes I0ab47e2f,Ib8016996Conley Owens2011-04-271-1/+2
| | | |\ \
| | | | * | Normalize output of XMLtree contentShachar Shemesh2011-04-111-1/+2
* | | | | | Fix build.Brian Carlstrom2011-06-221-1/+0
* | | | | | Merge "Add missing delegate to the layoutlib."Xavier Ducrohet2011-06-212-1/+5
|\ \ \ \ \ \
| * | | | | | Add missing delegate to the layoutlib.Xavier Ducrohet2011-06-212-1/+5
* | | | | | | Merge "Include testdata in layoutlib-tests."Brett Chabot2011-06-212-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Include testdata in layoutlib-tests.Brett Chabot2011-06-172-0/+2
* | | | | | | Output Proguard options for also overlay layouts.Ying Wang2011-06-201-0/+5
* | | | | | | am 810dc598: am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only...Dianne Hackborn2011-06-161-8/+48
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts SDK ...Dianne Hackborn2011-06-161-8/+48
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into...Dianne Hackborn2011-06-161-8/+48
| | |\ \ \ \ \ \
| | | * | | | | | New orientation handling. Only impacts SDK (aapt dump badging).Dianne Hackborn2011-06-161-8/+48
* | | | | | | | | am 0be8522b: am d1abd94f: am 04ce8111: Bring in more layout lib changes from ...Xavier Ducrohet2011-06-1614-196/+328
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | am d1abd94f: am 04ce8111: Bring in more layout lib changes from hc-mr1.Xavier Ducrohet2011-06-1614-196/+328
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bring in more layout lib changes from hc-mr1.Xavier Ducrohet2011-06-1614-196/+328
| | |/ / / / /
* | | | | | | Fix changed native method delegates in layoutlib for ICS.Xavier Ducrohet2011-06-153-6/+66
* | | | | | | resolved conflicts for merge of 77fc8b80 to masterDianne Hackborn2011-06-141-22/+134
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation f...Dianne Hackborn2011-06-141-22/+134
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Add new landscape and portrait orientation features.Dianne Hackborn2011-06-141-22/+134
* | | | | | | am f14dff12: am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on...Dianne Hackborn2011-06-101-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public s...Dianne Hackborn2011-06-101-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Okay *now* really enforce the limit on non-public styles.Dianne Hackborn2011-06-091-2/+2
* | | | | | | am 9980043e: am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build.Dianne Hackborn2011-06-101-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build.Dianne Hackborn2011-06-091-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Ummm... f*, stop breaking the build.Dianne Hackborn2011-06-091-2/+2
* | | | | | | resolved conflicts for merge of f51ded0f to masterDianne Hackborn2011-06-102-4/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag p...Dianne Hackborn2011-06-092-4/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Enforce public resource restriction on bag parents.Dianne Hackborn2011-06-092-4/+5
* | | | | | | am 48305f32: am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into...Xavier Ducrohet2011-06-103-20/+58
|\ \ \ \ \ \ \ | |/ / / / / /