OSDN Git Service

Merge changes from topic "am-0ee00745-3175-4746-9daa-2f8a6e252eaa" into oc-dev
authorAtanas Kirilov <akirilov@google.com>
Fri, 1 Jun 2018 00:00:41 +0000 (17:00 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jun 2018 00:00:41 +0000 (17:00 -0700)
commit2858be43cc160263137599795e9e2526c8da3642
tree86be60720120e5190cba5dc6f26995cc2f8576cb
parent3864be913c494149645ffb1c2cb70e7a5485aa65
parent1825f64fed64e1706e1337f072cdc066ec4a4381
Merge changes from topic "am-0ee00745-3175-4746-9daa-2f8a6e252eaa" into oc-dev
am: 1825f64fed

Change-Id: I970ec8ca35f66971985518866bc85cf5262089bd