tree 2301decead629b6b8d7963c24109db024eeb8153
parent ffd8c0c8bd9c9b9ca24622550ae9280e08525266
parent 0cc634548c34818ce9c2ad39f3a4a087c54814c0
author Yifan Hong <elsk@google.com> 1505512048 +0000
committer android-build-merger <android-build-merger@google.com> 1505512048 +0000

Merge changes from topic "lshal_released" am: 136c4bc7ab am: 3985d37c0d
am: 0cc634548c

Change-Id: Id981ebb3ec61209a4e4fe264ef6b1a193ebc0836