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

am: 46397ba42e

Change-Id: Id2060065cc8e59e2232c1080f5b5526247d37222
This commit is contained in:
Etan Cohen 2017-01-05 18:02:09 +00:00 committed by android-build-merger
commit b5def3a364

Diff content is not available