Adam Lesinski 8ee244355b resolved conflicts for merge of 522c5ce2 to master ...

Change-Id: I15c7f78e9c81947e33270251d7b50e592fb61583

2014-06-03 13:47:54 -07:00

..

aapt

resolved conflicts for merge of 522c5ce2 to master

2014-06-03 13:47:54 -07:00

aidl

am 71364f8c: am f5f4d930: am 74bebf6f: Exclude the host aapt and aidl from PDK build.

2014-03-08 05:46:48 +00:00

layoutlib

am 8af310c0: am 8f6a9a65: am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

2014-06-03 20:32:57 +00:00

obbtool

Revert "Move frameworks/base/tools/ to frameworks/tools/"

2014-01-27 10:31:04 -08:00

orientationplot

Revert "Move frameworks/base/tools/ to frameworks/tools/"

2014-01-27 10:31:04 -08:00

preload

Fix indirect misuse of $(my-dir).

2014-02-28 18:04:37 -08:00

validatekeymaps

Revert "Move frameworks/base/tools/ to frameworks/tools/"

2014-01-27 10:31:04 -08:00

velocityplot

Revert "Move frameworks/base/tools/ to frameworks/tools/"

2014-01-27 10:31:04 -08:00