tree 63d56f56213ffab00ac0fc35d7eddf4964526c56
parent 431856d7a60bdf1dc1dc0a5fe715d7512291fd5e
parent 407ec93f4a7c3b02072a248aabb3007da6ebebb6
author Yifan Hong <elsk@google.com> 1488563786 +0000
committer android-build-merger <android-build-merger@google.com> 1488563786 +0000

Merge changes from topic 'lshal_32' am: 2eaf6b8eae
am: 407ec93f4a

Change-Id: I222d3eb23b358ff2dda442027eeb3e7944b027d9