tree dd1a085e17b627cc4eec5d361e504a980e06916d
parent 2646ca50e5d57e39dc85481d4af028d9134773a4
parent e869d4e158d18e443f264c435d531d83c7da1441
author Michael Wright <michaelwr@google.com> 1518016784 +0000
committer android-build-merger <android-build-merger@google.com> 1518016784 +0000

Merge "Revert "Correct some GSI settings to board makefile"" am: 0b733a2036
am: e869d4e158

Change-Id: I690d03dbee97f97fb98e67f403dce7654f3d0810