tree 8c5fd103ad9cb132c552e2af85819c64f67b3634
parent 46208b62c8849eb57e04ff25ac0bdb879427c3bb
parent cebd6ad101b01c0ff3dc4d8681b4dcdf46b9c1ac
author Dan Albert <danalbert@google.com> 1478814839 +0000
committer android-build-merger <android-build-merger@google.com> 1478814839 +0000

Really fix the config. am: 8ddb74c7c0
am: cebd6ad101

Change-Id: I94c2eda2e58dd027a961dc896dadd9f6d90e54e8