Merge changes from topic 'HS2 API Cleanup'

am: 41fd0f1faf

Change-Id: Ic53fa2cad082484ebbbc9198511b0539dad97382
This commit is contained in:
Peter Qiu
2016-11-16 00:04:44 +00:00
committed by android-build-merger

Diff Content Not Available