Deepanshu Gupta 6c57fc3019 DO NOT MERGE - Fix LayoutLib. ...

This fixes a bad merge and contains partial cherrypicks of the following
commits to make LayoutLib working again:
103d40960daa0420995aa12881bef33892a0a2ab
803d77d8904a8fd66f0370cca6ed7f8b7cf68907
6a08225cee197e5baf80dd06dae46988db284122

Bug: 15987446
Change-Id: I41563305206d30ecdbc7f609c4b90d53edb42689

2014-07-16 10:23:28 -07:00

..

aapt

am 7e547e0d: Merge "Add --pseudo-localize option to generate resources for pseudolocales."

2014-06-03 20:35:11 +00:00

aidl

…

layoutlib

DO NOT MERGE - Fix LayoutLib.

2014-07-16 10:23:28 -07:00

obbtool

…

orientationplot

…

preload

…

validatekeymaps

…

velocityplot

…