OSDN Git Service

Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am...
authorAtanas Kirilov <akirilov@google.com>
Tue, 5 Jun 2018 01:19:38 +0000 (18:19 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Jun 2018 01:19:38 +0000 (18:19 -0700)
am: 224968eebd

Change-Id: I5f746f3ac87a3febe343667a890fb73e2b719bdd


Trivial merge