tree e85bff3012e9aeb534714fef0d353c4a69a529ba
parent 992fa650beadb605876fdbf4093e8f552b294f6b
parent 7d6944d40ab283a408f178606528d861177e9d9b
author Yifan Hong <elsk@google.com> 1494462864 +0000
committer android-build-merger <android-build-merger@google.com> 1494462864 +0000

Merge "lshal: remove "// static" comments" am: 8d2f788a05
am: 7d6944d40a

Change-Id: I36367aa4f5bd756d31855186066cd2e930e32414