tree 8aa8d658414ca5b75abeb7d3a7b425cdee547b16
parent 5e7b6c2c92a883cfbcef84c031212cc0425ffe45
parent beafd1c1c1030c71079f765f42599a20d9e58e55
author Pawin Vongmasa <pawin@google.com> 1471630991 +0000
committer android-build-merger <android-build-merger@google.com> 1471630991 +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: beafd1c1c1

Change-Id: Ib0f86b22bed3b0f87a6143788d9b2581e0104af6