OSDN Git Service

Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev
authorAtanas Kirilov <akirilov@google.com>
Mon, 4 Jun 2018 22:36:29 +0000 (15:36 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Jun 2018 22:36:29 +0000 (15:36 -0700)
am: 826b14e43e

Change-Id: If4056f03d27f845d30862b04dcbdb119141f2bf8


Trivial merge