| commit | aea82e8339fce946e945fb23dec3de53b966a4fa | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Mon Aug 10 23:51:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 10 23:51:38 2015 +0000 |
| tree | 674840ed0c92c08a0cf8ac7d3ea0a36de13e10bf | |
| parent | 22a8b4c49353731f031a090b9440776eaf1331ea [diff] | |
| parent | f695a009725c8c840d916d01c14998f5c5f816d2 [diff] |
am f695a009: (-s ours) ART: Change UnresolvedMergedType internal representation * commit 'f695a009725c8c840d916d01c14998f5c5f816d2': ART: Change UnresolvedMergedType internal representation