tree f413d0ec92a01a3e901424927e1634f25d0981b8
parent b07f2b92bcc1ae2950cee72c49992618fd0fec82
parent 0dae24ff44d6f332286c8a7bb7ea2bb3a6716103
author Mathieu Chartier <mathieuc@google.com> 1506674083 +0000
committer android-build-merger <android-build-merger@google.com> 1506674083 +0000

Merge "Add frameworks base config and move text blobs there" am: 34cf8b2c04
am: 0dae24ff44

Change-Id: Ie1c4ee3e50e804c41daf95ec8c65aa001ad4ffc0