tree d48143a6578abbea113a6de5ef5a1f974e2963d6
parent 30d2ce9b5e7117bb89565a6f13684bdfcb86cef0
author Stas Negara <snegara@google.com> 1421880848 -0800
committer Stas Negara <snegara@google.com> 1423256780 -0800

Adapted for merged custom and default configurations coming from AS extension point.

Change-Id: Ifff5e2ca6946a044352aaa90229f4526f636d2f4