Deepanshu Gupta e0be42a9f9 am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE] ...

* commit '40bfb60efa0e92259a417a5cbfd6095759c678b7':
  Fix build due to incorrect merges [DO NOT MERGE]

2014-05-13 23:40:37 +00:00

..

aapt

Fix the single crunch command to return the right error code.

2013-01-15 10:37:20 -08:00

aidl

Allow multiple 'parcelable' declarations in aidl files

2012-08-16 14:54:26 -07:00

layoutlib

am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE]

2014-05-13 23:40:37 +00:00

obbtool

frameworks/base refactoring

2012-02-20 22:38:43 -08:00

orientationplot

Small tweaks to orientation.

2012-05-07 18:30:18 -07:00

preload

Update preloaded-classes for JB-MR1

2012-09-19 13:32:21 -07:00

validatekeymaps

Support loading keyboard layout overlays from resources.

2012-04-17 17:56:32 -07:00

velocityplot

…