tree c3be45124617b8d836286dbdff2c681b6d384fa7
parent f09cd67d64ebc08a89975eeef38614449f55f7c0
parent 8b4cf25e89340673e5b72fe8695acc18fb5de453
author Pawin Vongmasa <pawin@google.com> 1471629259 +0000
committer android-build-merger <android-build-merger@google.com> 1471629259 +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

Change-Id: I7cfb7285c98a0fbc3d88886a4d2905d18c6fa276