OSDN Git Service

Merge changes from topic "am-3b6a3916-25a5-4937-a978-aa9d7658661a" into oc-dev
authorJack He <siyuanh@google.com>
Tue, 5 Jun 2018 02:49:04 +0000 (19:49 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Jun 2018 02:49:04 +0000 (19:49 -0700)
commit52bfa2bb6f36cca63b8bd9ece32d7773c69ce9aa
treec1335c7c337eb67c046822274d3e755db35b22a5
parenta6bb951521a2b9578f62fb404a0f6a906c5cddb8
parent6f887610ac5a73563002df0e1ec6f896f4e87333
Merge changes from topic "am-3b6a3916-25a5-4937-a978-aa9d7658661a" into oc-dev
am: 6f887610ac

Change-Id: Ib29a9d7fa791b539f1496a99dbbc3644e6760a5d