From: Etan Cohen <etancohen@google.com>
Date: Thu, 5 Jan 2017 17:58:36 +0000 (+0000)
Subject: Merge changes from topic 'qc_api_drop' am: 6ffa14dd6c
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=46397ba42e62e3c826fe76b6ffad5b9a8011ff2a;p=android-x86%2Fhardware-libhardware_legacy.git

Merge changes from topic 'qc_api_drop' am: 6ffa14dd6c
am: 4bcde74d50

Change-Id: I4571b4c445deabf2ee2d2d702284cb90737e0f0a
---

46397ba42e62e3c826fe76b6ffad5b9a8011ff2a