OSDN Git Service

Merge changes from topic 'qc_api_drop' am: 6ffa14dd6c
authorEtan Cohen <etancohen@google.com>
Thu, 5 Jan 2017 17:58:36 +0000 (17:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Jan 2017 17:58:36 +0000 (17:58 +0000)
am: 4bcde74d50

Change-Id: I4571b4c445deabf2ee2d2d702284cb90737e0f0a


Trivial merge