| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| | | * | | | Merge dba35f1b from honeycomb-mr1. do not merge. | Xavier Ducrohet | 2011-06-01 | 7 | -16/+13 |
| | * | | | | am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge. | Xavier Ducrohet | 2011-05-24 | 1 | -53/+58 |
| | |\ \ \ \
| | | |/ / / |
|
| | | * | | | Merge 6103e22c from honeycomb-mr1. do not merge. | Xavier Ducrohet | 2011-05-24 | 1 | -53/+58 |
| | * | | | | am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge. | Xavier Ducrohet | 2011-05-24 | 1 | -1/+1 |
| | |\ \ \ \
| | | |/ / / |
|
| | | * | | | Merge 2402ad60 from honeycomb-mr1. do not merge. | Xavier Ducrohet | 2011-05-23 | 1 | -1/+1 |
| | * | | | | am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge. | Xavier Ducrohet | 2011-05-23 | 3 | -32/+72 |
| | |\ \ \ \
| | | |/ / / |
|
| | | * | | | Merge e57aa434 from honeycomb-mr1. do not merge. | Xavier Ducrohet | 2011-05-20 | 3 | -32/+72 |
| | * | | | | am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gi... | Xavier Ducrohet | 2011-05-23 | 3 | -22/+33 |
| | |\ \ \ \
| | | |/ / / |
|
| | | * | | | Merge 05b7b69c from honeycomb-mr1. do not merge. | Xavier Ducrohet | 2011-05-19 | 3 | -22/+33 |
| | * | | | | am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gi... | Xavier Ducrohet | 2011-05-23 | 11 | -51/+799 |
| | |\ \ \ \
| | | |/ / /
| | | | / /
| | | |/ /
| | |/| | |
|
| | | * | | Merge 2fae858d from Honeycomb-mr1. do not merge. | Xavier Ducrohet | 2011-05-19 | 11 | -51/+799 |
| | * | | | am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996 | Conley Owens | 2011-04-27 | 1 | -1/+2 |
| | |\ \ \ |
|
| | | * \ \ | Merge changes I0ab47e2f,Ib8016996 | Conley Owens | 2011-04-27 | 1 | -1/+2 |
| | | |\ \ \ |
|
| | | | * | | | Normalize output of XMLtree content | Shachar Shemesh | 2011-04-11 | 1 | -1/+2 |
* | | | | | | | Fix build. | Brian Carlstrom | 2011-06-22 | 1 | -1/+0 |
* | | | | | | | Merge "Add missing delegate to the layoutlib." | Xavier Ducrohet | 2011-06-21 | 2 | -1/+5 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Add missing delegate to the layoutlib. | Xavier Ducrohet | 2011-06-21 | 2 | -1/+5 |
* | | | | | | | | Merge "Include testdata in layoutlib-tests." | Brett Chabot | 2011-06-21 | 2 | -0/+2 |
|\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | | |
|
| * | | | | | | | Include testdata in layoutlib-tests. | Brett Chabot | 2011-06-17 | 2 | -0/+2 |
* | | | | | | | | Output Proguard options for also overlay layouts. | Ying Wang | 2011-06-20 | 1 | -0/+5 |
* | | | | | | | | am 810dc598: am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only... | Dianne Hackborn | 2011-06-16 | 1 | -8/+48 |
|\ \ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | | |
|
| * | | | | | | | am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts SDK ... | Dianne Hackborn | 2011-06-16 | 1 | -8/+48 |
| |\ \ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
|
| | * | | | | | | Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into... | Dianne Hackborn | 2011-06-16 | 1 | -8/+48 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | New orientation handling. Only impacts SDK (aapt dump badging). | Dianne Hackborn | 2011-06-16 | 1 | -8/+48 |
* | | | | | | | | | am 0be8522b: am d1abd94f: am 04ce8111: Bring in more layout lib changes from ... | Xavier Ducrohet | 2011-06-16 | 14 | -196/+328 |
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
| | | | / / / / /
| |_|_|/ / / / /
|/| | | | | | | |
|
| * | | | | | | | am d1abd94f: am 04ce8111: Bring in more layout lib changes from hc-mr1. | Xavier Ducrohet | 2011-06-16 | 14 | -196/+328 |
| |\ \ \ \ \ \ \
| | |/ / / / / / |
|
| | * | | | | | | Bring in more layout lib changes from hc-mr1. | Xavier Ducrohet | 2011-06-16 | 14 | -196/+328 |
| | |/ / / / / |
|
* | | | | | | | Fix changed native method delegates in layoutlib for ICS. | Xavier Ducrohet | 2011-06-15 | 3 | -6/+66 |
* | | | | | | | resolved conflicts for merge of 77fc8b80 to master | Dianne Hackborn | 2011-06-14 | 1 | -22/+134 |
|\ \ \ \ \ \ \
| |/ / / / / / |
|
| * | | | | | | am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation f... | Dianne Hackborn | 2011-06-14 | 1 | -22/+134 |
| |\ \ \ \ \ \
| | |/ / / / / |
|
| | * | | | | | Add new landscape and portrait orientation features. | Dianne Hackborn | 2011-06-14 | 1 | -22/+134 |
* | | | | | | | am f14dff12: am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on... | Dianne Hackborn | 2011-06-10 | 1 | -2/+2 |
|\ \ \ \ \ \ \
| |/ / / / / / |
|
| * | | | | | | am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public s... | Dianne Hackborn | 2011-06-10 | 1 | -2/+2 |
| |\ \ \ \ \ \
| | |/ / / / / |
|
| | * | | | | | Okay *now* really enforce the limit on non-public styles. | Dianne Hackborn | 2011-06-09 | 1 | -2/+2 |
* | | | | | | | am 9980043e: am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build. | Dianne Hackborn | 2011-06-10 | 1 | -2/+2 |
|\ \ \ \ \ \ \
| |/ / / / / / |
|
| * | | | | | | am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build. | Dianne Hackborn | 2011-06-09 | 1 | -2/+2 |
| |\ \ \ \ \ \
| | |/ / / / / |
|
| | * | | | | | Ummm... f*, stop breaking the build. | Dianne Hackborn | 2011-06-09 | 1 | -2/+2 |
* | | | | | | | resolved conflicts for merge of f51ded0f to master | Dianne Hackborn | 2011-06-10 | 2 | -4/+5 |
|\ \ \ \ \ \ \
| |/ / / / / / |
|
| * | | | | | | am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag p... | Dianne Hackborn | 2011-06-09 | 2 | -4/+5 |
| |\ \ \ \ \ \
| | |/ / / / / |
|
| | * | | | | | Enforce public resource restriction on bag parents. | Dianne Hackborn | 2011-06-09 | 2 | -4/+5 |
* | | | | | | | am 48305f32: am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into... | Xavier Ducrohet | 2011-06-10 | 3 | -20/+58 |
|\ \ \ \ \ \ \
| |/ / / / / / |
|
| * | | | | | | am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2 | Xavier Ducrohet | 2011-06-09 | 3 | -20/+58 |
| |\ \ \ \ \ \
| | |/ / / / / |
|
| | * | | | | | Merge 06942bc4 from hc-mr1. | Xavier Ducrohet | 2011-06-08 | 2 | -4/+9 |
| | * | | | | | Merge 988eeeb5 from hc-mr1. | Xavier Ducrohet | 2011-06-08 | 3 | -16/+49 |
* | | | | | | | am abc83871: am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr... | Xavier Ducrohet | 2011-06-07 | 13 | -103/+348 |
|\ \ \ \ \ \ \
| |/ / / / / / |
|
| * | | | | | | am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into hone... | Xavier Ducrohet | 2011-06-06 | 13 | -103/+348 |
| |\ \ \ \ \ \
| | |/ / / / / |
|
| | * | | | | | Import the Layoutlib from hc-mr1. | Xavier Ducrohet | 2011-06-03 | 13 | -103/+348 |
* | | | | | | | resolved conflicts for merge of 54cb63e2 to master | Dianne Hackborn | 2011-06-02 | 1 | -0/+5 |
|\ \ \ \ \ \ \
| |/ / / / / / |
|
| * | | | | | | am 528c49f1: am b96cbbd1: Add "tv" density for 720p screens. | Dianne Hackborn | 2011-05-27 | 1 | -0/+5 |
| |\ \ \ \ \ \
| | |/ / / / / |
|
| | * | | | | | Add "tv" density for 720p screens. | Dianne Hackborn | 2011-05-27 | 1 | -0/+5 |