Merge changes from topic 'aosp-generics-api'

am: fe9357f6e7

Change-Id: Ifff5983e6c85faefa91e8ec5de4221cc715c575c
This commit is contained in:
Michael Wright
2016-09-26 14:19:45 +00:00
committed by android-build-merger

Diff Content Not Available