OSDN Git Service

Merge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev
authorWei Jia <wjia@google.com>
Tue, 10 Oct 2017 23:28:26 +0000 (23:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Oct 2017 23:28:26 +0000 (23:28 +0000)
commite14c028ff7e1166d35768e3be4ee6cd14c5ff8fa
tree720ec3a062f5b408eb929888b7abfb5410df6ce5
parent648703351fd78c1704fa413c0f375198e36039d1
parent402b8a0ef5c4fa0f7a70020bf0d93ec4714edbf3
Merge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev
am: 402b8a0ef5

Change-Id: Id2a604cf81ce8f44739365d77d5777caccf76220