Chad Jones 1fb5528643 resolved conflicts for merge of 57bb5f5c to master ...

Change-Id: Id5dfe7fc919305658312771a031c0764cef5515c

2015-02-23 21:19:58 -08:00

..

aapt

Merge "Parse res-car as resources for UI_MODE_TYPE_CAR.."

2015-02-11 14:01:36 +00:00

aidl

kill OS_CASE_SENSITIVE

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

apilint

Switch to incremental API parsing.

2015-02-22 16:00:19 -08:00

layoutlib

resolved conflicts for merge of 57bb5f5c to master

2015-02-23 21:19:58 -08:00

obbtool

Merge "Remove superfluous OpenSSL include paths." automerge: fe24754 automerge: d555cd5

2015-01-23 11:05:28 +00:00

orientationplot

…

preload

…

split-select

Process base APK

2015-01-16 14:11:30 -08:00

validatekeymaps

…

velocityplot

…