Deepanshu Gupta a43aaf00b5 resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev ...

Change-Id: I4ab1b0a71b99692458efc3a67c8a8da3690afb7b

2014-05-13 09:49:18 -07:00

..

aapt

…

aidl

…

layoutlib

…

obbtool

…

orientationplot

…

preload

…

validatekeymaps

…

velocityplot

…