OSDN Git Service

Merge "Move mirror::Object setters to ObjPtr" am: 0d7398fd54
authorMathieu Chartier <mathieuc@google.com>
Fri, 7 Oct 2016 17:08:01 +0000 (17:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Oct 2016 17:08:01 +0000 (17:08 +0000)
am: 153b83e8da

Change-Id: I813b4b90b3ff65f9f0c9daa61cc3717972968c71


Trivial merge