Deepanshu Gupta 03a057c1af Manual merge of changes from frameworks/base/tools ...

Manually merge of following changes:
9cb5f5b523
1cf5df38f4
083e3caf66
81f74f4bc9
39e7583539
272d1bce79
45f5cd49fa

Change-Id: Ie21ca480ac117e16e28eb554474835b762ccb104

2014-01-27 10:31:09 -08:00

..

com/android/tools/layoutlib/create

Manual merge of changes from frameworks/base/tools

2014-01-27 10:31:09 -08:00

data

Manual merge of changes from frameworks/base/tools

2014-01-27 10:31:09 -08:00

mock_data

Manual merge of changes from frameworks/base/tools

2014-01-27 10:31:09 -08:00