tree b6009ea97647a1a5447b2488c2a667cf13b4b0d9
parent 408fdb2b90491de0b184db6a20429f94508a2321
parent 0665b5f12231ceb7c3cfe86a93dc899dc5973a1e
author Dan Albert <danalbert@google.com> 1479011008 +0000
committer android-build-merger <android-build-merger@google.com> 1479011008 +0000

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

Change-Id: I9d355744ecc05bae7511bd1d920ed69baf582ebb