tree 5b34576069c092045365779317b7b372c6503f80
parent cf5deaa6dacddf84753925249c3d35b31df41b82
parent 3f0be7e775712df0ef34af4a45480e537d44bb8a
author Mathieu Chartier <mathieuc@google.com> 1506683428 +0000
committer android-build-merger <android-build-merger@google.com> 1506683428 +0000

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

Change-Id: I9e14a4ab6df25ef2aefb34459472762243e9b6f1