tree 499ac770090d25d504d81229324fc7ed4cbda5f2
parent 3e84f0fa0a935a9accd625b507a642a583fd5a7d
parent 303322f06a8b32de83e83be605991e78e039b4b7
author Yifan Hong <elsk@google.com> 1505177848 +0000
committer android-build-merger <android-build-merger@google.com> 1505177848 +0000

Merge changes from topic "lshal_pretty"
am: 303322f06a

Change-Id: Id11633ecd807d5318593fcd94173b11b0880475e