Narayan Kamath 8773d51eae resolved conflicts for merge of b82b2f98 to klp-dev-plus-aosp ...

Change-Id: Ia110056e5fdd2387c207748b17c5c17d1a18ac5b

2014-01-28 19:47:58 +00:00

..

aapt

AssetManager cookies should be int32_t and not void*.

2014-01-27 11:20:24 +00:00

aidl

Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD

2013-11-22 11:18:57 -08:00

layoutlib

resolved conflicts for merge of b82b2f98 to klp-dev-plus-aosp

2014-01-28 19:47:58 +00:00

obbtool

desperate attempt to fix linux build.

2013-05-07 19:52:05 -07:00

orientationplot

…

preload

Exclude magic inner-class name from preload

2013-07-23 22:37:37 -07:00

validatekeymaps

Move input library code to frameworks/native.

2013-07-01 20:11:42 -07:00

velocityplot

…