mainline: fold one ion fix into the original patch

Change-Id: Ia3e5f6b9c36bb41c52ca306e5eac53592f925529
Cc: Sandeep Patil <sspatil@google.com>
Signed-off-by: Matthias Maennich <maennich@google.com>
4 files changed
tree: 2d64252ef9cd87f41f8874fdfb7ca06172bf0300
  1. android-mainline/