Tim Kilbourn 9eaaaf0fe3 resolved conflicts for merge of a81ee86b to master ...

Change-Id: I7be3a64261d2405eda55b43c02b47657f393c095

2014-03-07 23:04:03 -08:00

..

aapt

resolved conflicts for merge of a81ee86b to master

2014-03-07 23:04:03 -08: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 b2334254: am ec84ada6: am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock"

2014-02-27 23:41:38 +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