OSDN Git Service

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

Change-Id: I7e238a6e7e6c53241992771be39a1be85c333730


Trivial merge