Dan Willemsen dc3b852125 resolve merge conflicts of 8416096 to nyc-dev-plus-aosp ...

Change-Id: I1638601fe84dda01bf52c59eb6c976bc1fe37498

2016-03-23 15:31:32 -07:00

..

aapt

Merge "Work-around paletted image decoding bug in SDK_JELLYBEAN" into nyc-dev

2016-03-21 18:26:19 +00:00

aapt2

Merge "AAPT2: statically link protobuf library" into nyc-dev

2016-03-11 21:33:34 +00:00

apilint

More lint checks.

2016-02-29 16:19:46 -07:00

fonts

Temporarily disable emoji availability check

2016-03-22 17:50:58 -07:00

layoutlib

Merge "Exclude java namespace classes from layoutlib" into nyc-dev

2016-03-23 20:48:15 +00:00

localedata

Implement smarter locale resource selection

2016-01-21 13:47:22 -08:00

obbtool

…

orientationplot

…

preload

…

preload2

Remove custom copy rules, stop using ACP

2016-03-23 13:42:52 -07:00

split-select

…

validatekeymaps

…

velocityplot

…

aidl

Remove the aidl tool

2015-11-17 14:52:31 +00:00