tree f115b5bb1162f674b01bf82854644f2e8b6f4613
parent 882fc3c47b3af649fcaf1b33b8b9fde85b41869f
parent c02035e964ba16dcd9188a340a9e0d6e8b2e3d4d
author Pawin Vongmasa <pawin@google.com> 1471644335 +0000
committer android-build-merger <android-build-merger@google.com> 1471644335 +0000

DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65 am: 2a21f09fff  -s ours am: 83cf293b73  -s ours am: 45cd2f896b am: 52f7319fc0 am: ab5c805aec  -s ours am: 1dd4973234 am: 484d229a3c am: 2c4162e822 am: ab3d5af8d2  -s ours am: 7e822583ee am: 554ad9b1fa am: f517b3013e am: 1c0929fc86
am: c02035e964  -s ours

Change-Id: I922a3dfc8754a5fb7ae93d65d0eefe9a9fcc7504