Dianne Hackborn e2c7715c77 resolved conflicts for merge of bbca8133 to master ...

Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6

2011-05-24 11:27:11 -07:00

..

aapt

am 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2

2011-05-23 16:16:54 -07:00

aidl

…

layoutlib

am a13462a9: am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1

2011-05-19 08:58:18 -07:00

localize

…

makekeycodes

…

obbtool

…

orientationplot

…

preload

…

validatekeymaps

…

velocityplot

Improve VelocityTracker numerical stability.

2011-03-15 19:59:47 -07:00