tree 9af918dfd2bf29d31956d1a38ee28a181d4828d8
parent 902de51533645294a29008e858841da7fb372868
parent 63a36d7b628101cbcc367b86c9d5c318ad92ceba
author Yifan Hong <elsk@google.com> 1484687521 +0000
committer android-build-merger <android-build-merger@google.com> 1484687521 +0000

Merge "Add test for type resolution." am: 5835d9ea59 am: 168bb896b7 am: 6cc9f50bd3
am: 63a36d7b62

Change-Id: I0477b4dc3e782752a556003ddaced227d2271b06