commit | 5581e229a6ae09efa098aeb5804507e940e951fa | [log] [tgz] |
---|---|---|
author | Yifan Hong <elsk@google.com> | Mon Feb 13 19:40:23 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Feb 13 19:40:23 2017 +0000 |
tree | f00f0ad821c3ce97fa2b09ebc1ecf6c5778b80f3 | |
parent | 3d2dbf4d2f6677ac5199f02a5354a20d89afce55 [diff] | |
parent | d99d31d5d3ea31adb1a1b647ed3aa69c24351445 [diff] |
Merge changes from topic 'lshal' am: c9bc03729b am: d99d31d5d3 Change-Id: I615d885788739a2d3d2f11204ad23833a77d96d5