Colin Cross d4d4658766 resolved conflicts for merge of 90b39aba to master-lockscreen-dev ...

Change-Id: I2871a1e49c3b443cc7479f2352c652be3b0fb85b

2014-04-10 22:41:05 -07:00

..

aapt

am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev

2014-04-04 19:34:11 +00:00

aidl

am 71364f8c: am f5f4d930: am 74bebf6f: Exclude the host aapt and aidl from PDK build.

2014-03-08 05:46:48 +00:00

layoutlib

resolved conflicts for merge of 90b39aba to master-lockscreen-dev

2014-04-10 22:41:05 -07:00

obbtool

…

orientationplot

…

preload

Fix indirect misuse of $(my-dir).

2014-02-28 18:04:37 -08:00

validatekeymaps

…

velocityplot

…