tree 4960c05337121bdc09909de1d7d87bf5cbfabecb
parent 71556cb74be65c697de55fcdfea8f3bc1eaaa576
parent 1764b1dae7c0e6050ea21c254b3db908e4fcf9fb
author Mathieu Chartier <mathieuc@google.com> 1475101897 +0000
committer android-build-merger <android-build-merger@google.com> 1475101897 +0000

Merge "Use ObjPtr for reflection.cc/h/inl" am: 4d46970b8a am: db7e1c3ba7
am: 1764b1dae7

Change-Id: I196dd74a0f029f6f50442affd11e9beae55b659e