OSDN Git Service

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

Change-Id: I66fd3f8b55793fc56d39d36267b24d9e04310437


Trivial merge