Xavier Ducrohet 34f5991ebe Merge 6103e22c from honeycomb-mr1. do not merge. ...

LayoutLib: custom styles override the default style instead of replacing it.

Intead of reading either the custom or the default style for a widget, we
read both and use the values from the custom style if it exists, or
from the default style otherwise.

Change-Id: Ibcec2e9b1e8a95295ab26ede145c287ff2f30be4

2011-05-24 10:55:30 -07:00

..

aapt

GL texture filtering changed from AND to OR, so rename tag name to match.

2010-12-13 16:25:54 -08:00

aidl

am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo

2010-06-15 15:21:14 -07:00

layoutlib

Merge 6103e22c from honeycomb-mr1. do not merge.

2011-05-24 10:55:30 -07:00

localize

Fix linux 64 build

2010-08-24 20:20:50 -07:00

makekeycodes

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

obbtool

Link against the static libcrypto in external/openssl.

2010-10-14 16:13:31 -07:00

preload

Regenerate preloaded classes for Gingerbread.

2010-10-13 16:55:26 -07:00