Dianne Hackborn 711516d140 resolved conflicts for merge of 77fc8b80 to master ...

Change-Id: I014f9a886d6f05607d2a5d101ad2052a6841ee8d

2011-06-14 12:17:35 -07:00

..

aapt

am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2

2011-06-14 11:40:06 -07:00

aidl

Add notice files for aapt and aidl.

2011-02-28 18:36:41 -08:00

layoutlib

am 48305f32: am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2

2011-06-10 10:31:52 -07:00

localize

…

makekeycodes

…

obbtool

…

orientationplot

New orientation listener.

2011-01-24 13:46:57 -08:00

preload

Update preloaded-classes for Honeycomb.

2011-01-21 17:25:55 -08:00

validatekeymaps

Add new axes for joysticks and mouse wheels.

2011-02-19 05:23:10 -08:00

velocityplot

Improve VelocityTracker numerical stability. (DO NOT MERGE)

2011-05-23 17:19:59 -07:00