Michael Wright 6484c0e013 Merge addition of supports-input tag into master ...

aapt has been moved out of f/b which caused merged conflicts in
the original commit

Conflicts:
	tools/aapt/Command.cpp

Change-Id: I181ac6a3382eb4858110b30c64fc734a8af4929b

2013-09-06 09:39:34 -07:00

..

assets

…

res

Merge addition of supports-input tag into master

2013-09-06 09:39:34 -07:00

Android.mk

…

AndroidManifest.xml

am 3d27c9f9: am f1eebfc2: Merge "Remove unused APIs and rename others based on API review" into klp-dev

2013-09-05 17:33:19 -07:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…