Jeff Brown b437a79b05 resolved conflicts for merge of 21dffd5d to master ...

Change-Id: I37c48dee471c9d43f19c1fe4a01f70db53e2441f

2013-04-08 19:05:15 -07:00

..

aapt

aapt: add support for optional uses-permission

2013-04-03 16:32:40 -07:00

aidl

Revert "Tentative fix for aidl import issue"

2013-02-15 16:07:56 -08:00

layoutlib

resolved conflicts for merge of 21dffd5d to master

2013-04-08 19:05:15 -07:00

obbtool

frameworks/base refactoring

2012-02-20 22:38:43 -08:00

orientationplot

Small tweaks to orientation.

2012-05-07 18:30:18 -07:00

preload

Update preloaded-classes for JB-MR1

2012-09-19 13:32:21 -07:00

validatekeymaps

Support loading keyboard layout overlays from resources.

2012-04-17 17:56:32 -07:00

velocityplot

…