OSDN Git Service

[automerger skipped] Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev...
authorRyan Mitchell <rtmitchell@google.com>
Thu, 7 Jun 2018 05:24:04 +0000 (22:24 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Jun 2018 05:24:04 +0000 (22:24 -0700)
am: 35dfd46378  -s ours

Change-Id: Icc7661bca07e16f0b230b35ab7f1df8f0d8a8189


Trivial merge