tree 3c908002aabd896245764e921c26ef1e90c9c41c
parent 8d3069503e64dd573eed12d66da0fd51ded1b7b5
parent c972254b584b49d2a82da586f7e31c0dd1ad61a0
author Yifan Hong <elsk@google.com> 1487268898 +0000
committer android-build-merger <android-build-merger@google.com> 1487268898 +0000

Merge changes from topic 'lshal' am: 7e894fc94f
am: c972254b58

Change-Id: I1b5c1eceb88b57a50331340709c50507eb8f9bf8