OSDN Git Service

Merge changes from topic "am-3b6a3916-25a5-4937-a978-aa9d7658661a" into oc-dev am...
authorJack He <siyuanh@google.com>
Tue, 5 Jun 2018 02:55:38 +0000 (19:55 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Jun 2018 02:55:38 +0000 (19:55 -0700)
commit051d3a963f6ec2756f8e912110f5a6667850e78e
tree20b43b94d36bc1ad85448e595ee835f6e8d343ba
parent7ec9cd0fa0abcfbe39f709729073aef76c917e44
parent72e5c0e9e32d33b2d46f5fe1707a65245ed0f333
Merge changes from topic "am-3b6a3916-25a5-4937-a978-aa9d7658661a" into oc-dev am: 6f887610ac am: 52bfa2bb6f
am: 72e5c0e9e3

Change-Id: Ic66b4cdd08cf277fcc476bb3d8fe0fa9efb79ec3