tree 18f0510f0aa61c5e4269d3e8beb20a0dad62a04a
parent 3d1b00315f1b62a4db9f679fe80d928736be54c8
parent d732fd4f367018165b3881284cf588af9a86fbcf
author Michael Wright <michaelwr@google.com> 1474904311 +0000
committer android-build-merger <android-build-merger@google.com> 1474904311 +0000

Merge "DO NOT MERGE Track generics in support API definition."
am: d732fd4f36  -s ours

Change-Id: I7008d4e24963640042e9acc3c6307faf9d15efea