OSDN Git Service

Merge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into oc-dev am...
authorMyles Watson <mylesgw@google.com>
Wed, 7 Feb 2018 21:49:49 +0000 (21:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Feb 2018 21:49:49 +0000 (21:49 +0000)
am: c18f2a2773

Change-Id: Ic4c0ca0f937955afbb8c017acdb46357bce5a470


Trivial merge