tree 71530ef319bd9dfce8017c0e82229352483aa593
parent 0954180087158fa81f9ed32bf92e5afe8867be77
parent 1f84a02d157cdb468782f128a524384722406ea4
author Pawin Vongmasa <pawin@google.com> 1471626849 +0000
committer android-build-merger <android-build-merger@google.com> 1471626849 +0000

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

Change-Id: Ib395d9fee37f51fd735dca8ba67fd37ab3f7606b