OSDN Git Service

Merge changes from topic "b-68279369" into oc-dr1-dev am: 885bf1302e -s ours
authorJason Monk <jmonk@google.com>
Fri, 27 Oct 2017 03:30:28 +0000 (03:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 Oct 2017 03:30:28 +0000 (03:30 +0000)
am: 74fc763fc8

Change-Id: Ib90ed41698e308d53a2619abe2fa6f028eeaf07a


Trivial merge