Kenny Root f25d24b2c7 resolved conflicts for merge of 8b1082bb to master ...

Change-Id: If9d898123894c53bf83ac28cc7c03cd849c8ef17

2010-10-15 13:10:01 -07:00

..

aapt

am b58af2b8: am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread

2010-10-15 08:33:00 -07: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

am 556866a2: am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into gingerbread

2010-10-08 17:59:13 -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

Add "none" for vold and deprecate mkobb -c

2010-10-01 14:02:47 -07:00

preload

Regenerate preloaded classes for Gingerbread.

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