tree a5db66519262c1f0360138bdd80e0b57a0ebeac4
parent dd6fc9a1926e15267caf89bbf1806ff127b798b1
parent d2cfa11dc21f8af74062d84be9eb8aa520d0268a
author Pawin Vongmasa <pawin@google.com> 1471627631 +0000
committer android-build-merger <android-build-merger@google.com> 1471627631 +0000

Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev am: 7a66bd2404 am: c776d9b42f am: 06985c1dbc am: a25f2f5359 am: 1f84a02d15 am: 2482c5e73f am: 5da4e686f8
am: d2cfa11dc2

Change-Id: I3a66533a36743d2354b5bc690318d82949464441