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

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

Change-Id: Idcd9339737c2f1102b31def80a2045603470c69e