OSDN Git Service

Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am...
authorAtanas Kirilov <akirilov@google.com>
Mon, 4 Jun 2018 23:40:10 +0000 (16:40 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Jun 2018 23:40:10 +0000 (16:40 -0700)
am: a50293f72c

Change-Id: I20749db43dcab2085bcb9733601000cd96be14ce


Trivial merge