OSDN Git Service

Merge "Fix getting wrong instance when restoring non-config" into oc-dev
authorGeorge Mount <mount@google.com>
Thu, 30 Mar 2017 16:33:35 +0000 (16:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Mar 2017 16:33:35 +0000 (16:33 +0000)
am: 8386603230

Change-Id: I7ee0bb17c62ec2a40c4f2e168f88296b7bc86989


Trivial merge