tree 6f00f25e583ad61b77bbfd41cb3d37c6a77d0ec5
parent d6e85cc78270fa821b694f6700c48bfc774a4b48
parent 9764ba41a78d953f6a74dc7b352cb7cade8edf73
author Jeff Davidson <jpd@google.com> 1487706301 +0000
committer android-build-merger <android-build-merger@google.com> 1487706301 +0000

Merge "Don't execute code before checking a class is a messagenano." am: 89ebbfb9a9 am: 72070e4cf3
am: 9764ba41a7

Change-Id: Ib26e94738b13fa5040f299117eed839f5a1ef4f5