OSDN Git Service

Merge "Don't call into ResolveType with possible exception" am: 7a8e16c827
authorMathieu Chartier <mathieuc@google.com>
Wed, 14 Dec 2016 21:20:42 +0000 (21:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Dec 2016 21:20:42 +0000 (21:20 +0000)
am: 344eadad7e

Change-Id: Iadd0df38779ed62ee8eda3097be9087951261e49


Trivial merge