OSDN Git Service

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

Change-Id: Ia35e09b9935da7bd63f08afd82dac950a9acd344


Trivial merge