tree 8c5fd103ad9cb132c552e2af85819c64f67b3634
parent 7e947ac97b302c95cf5a4d206fe7589156b90298
parent db6c95c2ed2d3df8f2367d7c77d28d8a57347d5c
author Dan Albert <danalbert@google.com> 1479011458 +0000
committer android-build-merger <android-build-merger@google.com> 1479011458 +0000

Really fix the config. am: 152790833c am: 0665b5f122
am: db6c95c2ed

Change-Id: Ie87baed1e353fe665f67efca20565753bcb2c6d7