Raphael Moll bce1011dd2 resolved conflicts for merge of 8cf489c1 to jb-dev-plus-aosp ...

Change-Id: I06608e3c122b8f321429d457c51aa2213dd238b4

2012-06-14 14:14:45 -07:00

..

aapt

am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev

2012-06-12 12:41:36 -07:00

aidl

…

layoutlib

resolved conflicts for merge of 8cf489c1 to jb-dev-plus-aosp

2012-06-14 14:14:45 -07:00

obbtool

…

orientationplot

…

preload

…

validatekeymaps

…

velocityplot

…