tree 86b0ca466ccf9e130a0a4ab94f91b58c3abdf888
parent 9d44d9dd53bd3da3b01445a52b5d2420dc40f9b2
parent 425c5485dfe0e45fce2738972e0826aa366a4c9a
author Elliott Hughes <enh@google.com> 1465854939 +0000
committer android-build-merger <android-build-merger@google.com> 1465854939 +0000

Fix the build flags. am: f2233f4546
am: 425c5485df

Change-Id: Ifcd033cd4f29d45ca308a32f835c5481494657ef