tree a5db66519262c1f0360138bdd80e0b57a0ebeac4
parent 95977e66022251b47237a0ecd29df21b8a25d96c
parent ab3d5af8d26b55e5fc34092265d4ba28e8652eb7
author Pawin Vongmasa <pawin@google.com> 1471630124 +0000
committer android-build-merger <android-build-merger@google.com> 1471630124 +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

Change-Id: I877a274aeb5bba02f40c2e75a64863a9e692b210