Bryan Mawhinney 24a2ae5fae Blacklist some new settings from backup ...

Also mark with @SmallTest in the hope that this will enable the test to run!

Test: run FrameworksCoreTests
Change-Id: If332dca6c1393a77208b21d20f98760cb126085b

2017-01-31 18:27:50 +00:00

..

java

Merge "Fix for endless loop in RelativeLayout."

2017-01-31 15:18:13 +00:00

jni

Introduce set/getFontVariationSettings.

2017-01-30 20:22:41 +09:00

proto/android

Add ability to dump settings as proto buf

2017-01-22 15:25:22 -08:00

res

Merge "Import translations. DO NOT MERGE"

2017-01-31 07:30:46 +00:00

tests

Blacklist some new settings from backup

2017-01-31 18:27:50 +00:00