OSDN Git Service

Merge changes from topic 'class-loaders-mr1' into oc-mr1-dev
authorCalin Juravle <calin@google.com>
Tue, 1 Aug 2017 18:51:28 +0000 (18:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 18:51:28 +0000 (18:51 +0000)
am: 565cab11ff

Change-Id: I11f2a6d1df31d1a27ce5295bcdf6fbbd540060bc


Trivial merge