Cherrypick so we can publish N version code description ASAP am: 491bc2b8d6

am: bae14052a0  -s ours

Change-Id: I48e9ceff6226b222c1fe83bdc670edfeea0dfa7d
This commit is contained in:
Dianne Hackborn
2016-09-20 21:21:42 +00:00
committed by android-build-merger

Diff Content Not Available