Adam Lesinski 8197cc460e AAPT2: Merge Styleables instead of overriding them ...

Styleables merge in AAPT. Preserve this behavior.

Bug:30970091
Change-Id: Ie68ca675aeecd873c0648682182e2fc574e329a0

2016-08-19 13:29:40 -07:00

..

aapt

Merge "AAPT: Handle gaps in resources when building splits"

2016-08-17 00:03:36 +00:00

aapt2

AAPT2: Merge Styleables instead of overriding them

2016-08-19 13:29:40 -07:00

apilint

…

fonts

Update lint check to accommodate new emoji sequences

2016-08-09 14:28:54 -07:00

layoutlib

Fix build breakage caused by incomplete impl

2016-08-08 17:10:04 -07:00

localedata

…

obbtool

…

orientationplot

…

preload

…

preload2

…

split-select

Merge "Fix google-explicit-constructor warnings." am: ea537bf5b3

2016-08-16 02:31:42 +00:00

validatekeymaps

…

velocityplot

…

aidl

…