| commit | fe54748372a91d23a7fce7d466b47c49e72d7a1e | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Mon Sep 26 14:21:39 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Sep 26 14:21:39 2016 +0000 |
| tree | d4a45abf5c25746acb52738ea32ffbeeaee4a108 | |
| parent | 53ab4d9cf04d5f44b9c286910be1d3c471923dc3 [diff] | |
| parent | 9d6e1f927e678a9cecf8186585fb604bfe333cd7 [diff] |
Merge "DO NOT MERGE Update 24.txt to include type variables." am: 0b7d448e5f -s ours am: 9d6e1f927e -s ours Change-Id: Ie9b70a6ca241c20d1c14f34dca550e2fefc9f2d9