OSDN Git Service

Merge changes from topic 'lshal' am: 1f2d5a9cda am: 65b5fab397
authorYifan Hong <elsk@google.com>
Thu, 26 Jan 2017 18:30:58 +0000 (18:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 18:30:58 +0000 (18:30 +0000)
commit86e0f74b0938ea7451eaf373926d8360be2cac4e
tree0b928775b7015c447e639492fd5c5ee8272491f8
parentbd0382f41d348bfea59c0b6a2fdcbaafdf43633e
parentcf41d3fa6949fd8131118a8d3d9ff9c096005087
Merge changes from topic 'lshal' am: 1f2d5a9cda am: 65b5fab397
am: cf41d3fa69

Change-Id: Ia11923e218c0594d2f67b95ec510fa80716d74e3