Deepanshu Gupta e88c120ebf resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again ...

The earlier resolution (a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2)
wasn't the right one. This fixes it.

Change-Id: I6a6dc908d3e7dd510064a46df932d129a58eed98

2015-01-06 14:58:37 -08:00

..

aapt

am 503a4494: am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-dev

2014-12-16 18:02:09 +00:00

aidl

kill OS_CASE_SENSITIVE

2014-11-10 16:08:50 -08:00

apilint

Catch incompatible API regressions.

2014-09-04 15:46:23 -07:00

layoutlib

resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again

2015-01-06 14:58:37 -08:00

obbtool

…

orientationplot

…

preload

…

split-select

split-select: fix OSX build

2014-11-10 17:39:47 -08:00

validatekeymaps

…

velocityplot

…