Adam Lesinski dacbaca1e4 am f425ba28: am 420a3801: am 247d27d1: Merge "Add better error message for AAPT file conflicts" into lmp-dev ...

* commit 'f425ba2835b6e865e4dd1d4dfc2407d52f34ebde':
  Add better error message for AAPT file conflicts

2014-08-21 22:18:05 +00:00

..

aapt

Merge "Add better error message for AAPT file conflicts" into lmp-dev

2014-08-21 22:00:25 +00: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

Fix "@null" resource values in LayoutLib.

2014-08-19 17:16:48 -07:00

obbtool

am f71a2835: Merge "PackageInfo is a class, not a struct" into lmp-dev-plus-aosp

2014-08-17 23:52:36 +00: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