OSDN Git Service

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

Change-Id: Id2060065cc8e59e2232c1080f5b5526247d37222


Trivial merge