tree 80f21ecad6442359919c672532fc9c62a7b72c85
parent e022ea98ee6029f9431d7c33704fea71f9fd527f
parent 6f1b29ef678b2bf7c3c6062e4983f3a450cd777b
author Michael Wright <michaelwr@google.com> 1474904573 +0000
committer android-build-merger <android-build-merger@google.com> 1474904573 +0000

Merge "DO NOT MERGE Track generics in API definition." into nyc-mr1-dev
am: 6f1b29ef67

Change-Id: Id8dd0eb4d799fa059e811c48027048ad27650559