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 00:18:51 +0000 (17:18 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Jun 2018 00:18:51 +0000 (17:18 -0700)
commit224968eebd1c2a35387cf0ddad8230225f391a21
tree4a82e94fdb4a6fe47004178499f037c03af063f0
parent7ed1343d0ac37f5d24f132c2b97458880456e7cb
parentf2a135ec5af72bc67f11f5ff1231a148fa79403e
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e am: 74d98110f3 am: a50293f72c
am: f2a135ec5a

Change-Id: Ifd13e7ffb4e632538aef51102b7f151777b7b626