tree 819488329f102dc14d10e7156fb5ace539f5f4a1
parent b77ce1b7baed776adcd2af5f2f6dab17e17e0c13
parent 226499214cdb64eff5287bc67b84f27f23800909
author Sarah Chin <sarahchin@google.com> 1575582521 -0800
committer android-build-merger <android-build-merger@google.com> 1575582521 -0800

Merge changes from topics "ngran", "update_ngran"
am: 226499214c

Change-Id: I164421a52add13fb78423ae92493ce9c10a58f03