OSDN Git Service

Merge changes from topic 'qc_api_drop' am: 6ffa14dd6c am: 4bcde74d50 am: 46397ba42e
authorEtan Cohen <etancohen@google.com>
Thu, 5 Jan 2017 18:06:08 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Jan 2017 18:06:08 +0000 (18:06 +0000)
am: b5def3a364

Change-Id: If40725244b1854c07111c1a90e157fc9ab38083a


Trivial merge