DO NOT MERGE Track generics in API definition. am: ae0c402a45 -s ours am: 9584c0e55f
am: 057b6c2b9a -s ours
Change-Id: Ia137a97a51fcd1dd67f227240769f34006492bbd
This commit is contained in: