tree 8aa8d658414ca5b75abeb7d3a7b425cdee547b16
parent 5887239455b8304a846d18b82f4418b137f4cb22
parent 01d5f486898f9576cc1c844699326fcda9907cf9
author Pawin Vongmasa <pawin@google.com> 1471629919 +0000
committer android-build-merger <android-build-merger@google.com> 1471629919 +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 am: 95977e6602 am: 8b4cf25e89 am: 8fa55f41f9
am: 01d5f48689

Change-Id: Idcbfaf55209a119f6b46047169c04b6f11f61dfe