OSDN Git Service

Merge changes from topic 'lshal' am: 1f2d5a9cda
authorYifan Hong <elsk@google.com>
Thu, 26 Jan 2017 18:27:25 +0000 (18:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 18:27:25 +0000 (18:27 +0000)
commitcf41d3fa6949fd8131118a8d3d9ff9c096005087
tree9e7ed0e8bcd81a5c0a6c1f49754c574c5c272dc6
parent6c24cc3dd66ecc4997598de33eb02c9529131845
parent65b5fab39704d84e3c1a22c3f11430d87bec698f
Merge changes from topic 'lshal' am: 1f2d5a9cda
am: 65b5fab397

Change-Id: If32d7c1459710e4f584be7740e8de785337dd54b